From aba95d0af260547f2f71997a1ef4c116f8204afb Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 14 May 2020 15:44:31 +0200 Subject: [PATCH 0001/1070] add multi select component --- scripts/core/superdesk-api.d.ts | 1 + .../ui/components/generic-form/form-field.tsx | 3 + .../generate-filter-for-server.tsx | 1 + .../get-form-group-for-filtering.tsx | 2 + .../generic-form/get-initial-values.tsx | 1 + .../input-types/select_multiple_values.tsx | 65 +++++++++++++++++++ .../generic-form/interfaces/form.ts | 1 + .../generic-form/interfaces/input-types.tsx | 1 + .../generic-form/tests/generic-form.spec.tsx | 1 + 9 files changed, 76 insertions(+) create mode 100644 scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 150e7ee4b2..40fbceef6f 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -672,6 +672,7 @@ declare module 'superdesk-api' { stageSingleValue = 'stage_singstageSingleValuele_value', macroSingleValue = 'macroSingleValue', yesNo = 'yesNo', + selectMultiple = 'selectMultiple', } export interface IFormField { // don't forget to update runtime type checks diff --git a/scripts/core/ui/components/generic-form/form-field.tsx b/scripts/core/ui/components/generic-form/form-field.tsx index 84003c8f84..45d6ebd9ba 100644 --- a/scripts/core/ui/components/generic-form/form-field.tsx +++ b/scripts/core/ui/components/generic-form/form-field.tsx @@ -13,6 +13,7 @@ import {StageSingleValue} from './input-types/stage_single_value'; import {getMacroSingleValue} from './input-types/macro_single_value'; import {YesNo} from './input-types/yes-no'; import {IFormField, IFormGroup} from 'superdesk-api'; +import {SelectMultipleValues} from './input-types/select_multiple_values'; export function getFormFieldComponent(type: FormFieldType): React.ComponentType> { switch (type) { @@ -34,6 +35,8 @@ export function getFormFieldComponent(type: FormFieldType): React.ComponentType< return getMacroSingleValue(); case FormFieldType.yesNo: return YesNo; + case FormFieldType.selectMultiple: + return SelectMultipleValues; default: assertNever(type); } diff --git a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx index 535ac251cb..40fc50bb38 100644 --- a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx +++ b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx @@ -15,6 +15,7 @@ export function generateFilterForServer(type: FormFieldType, value: any): any { case FormFieldType.deskSingleValue: case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: + case FormFieldType.selectMultiple: return value; case FormFieldType.textEditor3: diff --git a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx index 8038cc0d32..32a70c987b 100644 --- a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx +++ b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx @@ -24,6 +24,8 @@ function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { return FormFieldType.macroSingleValue; case FormFieldType.yesNo: return FormFieldType.yesNo; + case FormFieldType.selectMultiple: + return FormFieldType.selectMultiple; default: assertNever(type); } diff --git a/scripts/core/ui/components/generic-form/get-initial-values.tsx b/scripts/core/ui/components/generic-form/get-initial-values.tsx index 64eb2ba2ea..f2b3a21c3d 100644 --- a/scripts/core/ui/components/generic-form/get-initial-values.tsx +++ b/scripts/core/ui/components/generic-form/get-initial-values.tsx @@ -17,6 +17,7 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: case FormFieldType.yesNo: + case FormFieldType.selectMultiple: return {[field]: undefined}; case FormFieldType.checkbox: return {[field]: false}; diff --git a/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx b/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx new file mode 100644 index 0000000000..6d8a75d49a --- /dev/null +++ b/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx @@ -0,0 +1,65 @@ +import React from 'react'; +import classNames from 'classnames'; +import {IInputType} from '../interfaces/input-types'; + +type IProps = IInputType>; + +export class SelectMultipleValues extends React.Component { + render() { + const {items} = this.props.formField.component_parameters; + + if (this.props.previewOutput) { + if (this.props.value == null) { + return null; + } + + const itemsWithLabels = this.props.value.map((id) => items.find((item) => item.id === id)); + + if (itemsWithLabels.some((item) => item == null)) { + return ( + {this.props.value.join(', ')} + ); + } else { + return ( + {itemsWithLabels.map((item) => item.label).join(', ')} + ); + } + } + + return ( +
0, + 'sd-line-input--required': this.props.formField.required === true, + }, + ) + }> + + + { + this.props.issues.map((str, i) => ( +
{str}
+ )) + } +
+ ); + } +} diff --git a/scripts/core/ui/components/generic-form/interfaces/form.ts b/scripts/core/ui/components/generic-form/interfaces/form.ts index 82e15cf760..e391c686f1 100644 --- a/scripts/core/ui/components/generic-form/interfaces/form.ts +++ b/scripts/core/ui/components/generic-form/interfaces/form.ts @@ -10,6 +10,7 @@ export enum FormFieldType { stageSingleValue = 'stage_singstageSingleValuele_value', macroSingleValue = 'macroSingleValue', yesNo = 'yesNo', + selectMultiple = 'selectMultiple', } export function isIFormField(x: IFormGroup['form'][0]): x is IFormField { // don't forget to update runtime type checks diff --git a/scripts/core/ui/components/generic-form/interfaces/input-types.tsx b/scripts/core/ui/components/generic-form/interfaces/input-types.tsx index e622b0364f..8887774002 100644 --- a/scripts/core/ui/components/generic-form/interfaces/input-types.tsx +++ b/scripts/core/ui/components/generic-form/interfaces/input-types.tsx @@ -15,6 +15,7 @@ export interface IInputType { readonly issues: Array; // renders a minimal representation of the value without any editing controls + // used for rendering selected filters readonly previewOutput: boolean; // fieldName is only passed by components which can change multiple fields diff --git a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx index eba24a9c7e..2fff27dd13 100644 --- a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx +++ b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx @@ -19,6 +19,7 @@ function getTestFieldConfig(type: FormFieldType): IFormField { case FormFieldType.contentFilterSingleValue: case FormFieldType.deskSingleValue: case FormFieldType.yesNo: + case FormFieldType.selectMultiple: return { type: type, field: 'test-field', From 2aeed32ef8dab796bb99111d89dbeca286f08c94 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 14 May 2020 16:14:55 +0200 Subject: [PATCH 0002/1070] add select single value component --- scripts/core/superdesk-api.d.ts | 1 + .../ui/components/generic-form/form-field.tsx | 3 + .../generate-filter-for-server.tsx | 1 + .../get-form-group-for-filtering.tsx | 2 + .../generic-form/get-initial-values.tsx | 1 + .../input-types/select_multiple_values.tsx | 2 +- .../select_single_value_static.tsx | 59 +++++++++++++++++++ .../generic-form/interfaces/form.ts | 1 + .../generic-form/tests/generic-form.spec.tsx | 1 + 9 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 40fbceef6f..ca72c01f18 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -672,6 +672,7 @@ declare module 'superdesk-api' { stageSingleValue = 'stage_singstageSingleValuele_value', macroSingleValue = 'macroSingleValue', yesNo = 'yesNo', + select = 'select', selectMultiple = 'selectMultiple', } diff --git a/scripts/core/ui/components/generic-form/form-field.tsx b/scripts/core/ui/components/generic-form/form-field.tsx index 45d6ebd9ba..09f02cbddd 100644 --- a/scripts/core/ui/components/generic-form/form-field.tsx +++ b/scripts/core/ui/components/generic-form/form-field.tsx @@ -14,6 +14,7 @@ import {getMacroSingleValue} from './input-types/macro_single_value'; import {YesNo} from './input-types/yes-no'; import {IFormField, IFormGroup} from 'superdesk-api'; import {SelectMultipleValues} from './input-types/select_multiple_values'; +import {SelectSingleValue} from './input-types/select_single_value_static'; export function getFormFieldComponent(type: FormFieldType): React.ComponentType> { switch (type) { @@ -35,6 +36,8 @@ export function getFormFieldComponent(type: FormFieldType): React.ComponentType< return getMacroSingleValue(); case FormFieldType.yesNo: return YesNo; + case FormFieldType.select: + return SelectSingleValue; case FormFieldType.selectMultiple: return SelectMultipleValues; default: diff --git a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx index 40fc50bb38..2b0efe1d6b 100644 --- a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx +++ b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx @@ -15,6 +15,7 @@ export function generateFilterForServer(type: FormFieldType, value: any): any { case FormFieldType.deskSingleValue: case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: + case FormFieldType.select: case FormFieldType.selectMultiple: return value; diff --git a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx index 32a70c987b..641747323f 100644 --- a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx +++ b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx @@ -24,6 +24,8 @@ function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { return FormFieldType.macroSingleValue; case FormFieldType.yesNo: return FormFieldType.yesNo; + case FormFieldType.select: + return FormFieldType.select; case FormFieldType.selectMultiple: return FormFieldType.selectMultiple; default: diff --git a/scripts/core/ui/components/generic-form/get-initial-values.tsx b/scripts/core/ui/components/generic-form/get-initial-values.tsx index f2b3a21c3d..444eeb0d57 100644 --- a/scripts/core/ui/components/generic-form/get-initial-values.tsx +++ b/scripts/core/ui/components/generic-form/get-initial-values.tsx @@ -17,6 +17,7 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: case FormFieldType.yesNo: + case FormFieldType.select: case FormFieldType.selectMultiple: return {[field]: undefined}; case FormFieldType.checkbox: diff --git a/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx b/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx index 6d8a75d49a..94185e1cb9 100644 --- a/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx +++ b/scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx @@ -6,7 +6,7 @@ type IProps = IInputType>; export class SelectMultipleValues extends React.Component { render() { - const {items} = this.props.formField.component_parameters; + const items: Array<{id: string; label: string}> = this.props.formField.component_parameters.items; if (this.props.previewOutput) { if (this.props.value == null) { diff --git a/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx b/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx new file mode 100644 index 0000000000..77aca2c7b3 --- /dev/null +++ b/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx @@ -0,0 +1,59 @@ +import React from 'react'; +import classNames from 'classnames'; +import {IInputType} from '../interfaces/input-types'; + +type IProps = IInputType; + +export class SelectSingleValue extends React.Component { + render() { + const items: Array<{id: string; label: string}> = this.props.formField.component_parameters.items; + + if (this.props.previewOutput) { + if (this.props.value == null) { + return null; + } + + const itemWithLabel = items.find((item) => item.id === this.props.value); + + return ( + {itemWithLabel?.label ?? this.props.value} + ); + } + + return ( +
0, + 'sd-line-input--required': this.props.formField.required === true, + }, + ) + }> + + + { + this.props.issues.map((str, i) => ( +
{str}
+ )) + } +
+ ); + } +} diff --git a/scripts/core/ui/components/generic-form/interfaces/form.ts b/scripts/core/ui/components/generic-form/interfaces/form.ts index e391c686f1..7dd7913750 100644 --- a/scripts/core/ui/components/generic-form/interfaces/form.ts +++ b/scripts/core/ui/components/generic-form/interfaces/form.ts @@ -10,6 +10,7 @@ export enum FormFieldType { stageSingleValue = 'stage_singstageSingleValuele_value', macroSingleValue = 'macroSingleValue', yesNo = 'yesNo', + select = 'select', selectMultiple = 'selectMultiple', } diff --git a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx index 2fff27dd13..29356d28bf 100644 --- a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx +++ b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx @@ -19,6 +19,7 @@ function getTestFieldConfig(type: FormFieldType): IFormField { case FormFieldType.contentFilterSingleValue: case FormFieldType.deskSingleValue: case FormFieldType.yesNo: + case FormFieldType.select: case FormFieldType.selectMultiple: return { type: type, From d292184ec09fb11749efb2c201bf38bc67df72a3 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 15 May 2020 17:01:04 +0200 Subject: [PATCH 0003/1070] ensure that field label, not ID is displayed in filters --- .../ui/components/ListPage/generic-list-page.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 4ba88e2b7e..38eacd8168 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -512,22 +512,24 @@ export class GenericListPageComponent data-test-id="list-page--filters-active" > { - Object.keys(activeFilters).map((fieldName, i) => { + Object.keys(activeFilters).map((field_id, i) => { + const currentField = getFormFieldsFlat(formConfigForFilters).find( + ({field}) => field === field_id, + ); + const filterValuePreview = getFormFieldPreviewComponent( this.props.items.activeFilters, - getFormFieldsFlat(formConfigForFilters).find( - ({field}) => field === fieldName, - ), + currentField, ); return ( { - this.removeFilter(fieldName); + this.removeFilter(field_id); }} > - {fieldName}:{' '} + {currentField.label}:  {filterValuePreview} ); From af86a2c0d61c4c03c794eece24e7d96746134a44 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 15 May 2020 17:03:45 +0200 Subject: [PATCH 0004/1070] add number input --- scripts/core/superdesk-api.d.ts | 1 + .../ui/components/generic-form/form-field.tsx | 3 ++ .../generate-filter-for-server.tsx | 1 + .../get-form-group-for-filtering.tsx | 2 + .../generic-form/get-initial-values.tsx | 1 + .../generic-form/input-types/number.tsx | 42 +++++++++++++++++++ .../generic-form/interfaces/form.ts | 1 + .../generic-form/tests/generic-form.spec.tsx | 1 + 8 files changed, 52 insertions(+) create mode 100644 scripts/core/ui/components/generic-form/input-types/number.tsx diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index ca72c01f18..604c8366c2 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -665,6 +665,7 @@ declare module 'superdesk-api' { export enum FormFieldType { textSingleLine = 'textSingleLine', textEditor3 = 'textEditor3', + number = 'number', vocabularySingleValue = 'vocabularySingleValue', checkbox = 'checkbox', contentFilterSingleValue = 'contentFilterSingleValue', diff --git a/scripts/core/ui/components/generic-form/form-field.tsx b/scripts/core/ui/components/generic-form/form-field.tsx index 09f02cbddd..f5035ed1af 100644 --- a/scripts/core/ui/components/generic-form/form-field.tsx +++ b/scripts/core/ui/components/generic-form/form-field.tsx @@ -15,6 +15,7 @@ import {YesNo} from './input-types/yes-no'; import {IFormField, IFormGroup} from 'superdesk-api'; import {SelectMultipleValues} from './input-types/select_multiple_values'; import {SelectSingleValue} from './input-types/select_single_value_static'; +import {NumberComponent} from './input-types/number'; export function getFormFieldComponent(type: FormFieldType): React.ComponentType> { switch (type) { @@ -22,6 +23,8 @@ export function getFormFieldComponent(type: FormFieldType): React.ComponentType< return TextSingleLine; case FormFieldType.textEditor3: return TextEditor3; + case FormFieldType.number: + return NumberComponent; case FormFieldType.vocabularySingleValue: return VocabularySingleValue; case FormFieldType.checkbox: diff --git a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx index 2b0efe1d6b..5f4f5500c6 100644 --- a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx +++ b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx @@ -17,6 +17,7 @@ export function generateFilterForServer(type: FormFieldType, value: any): any { case FormFieldType.macroSingleValue: case FormFieldType.select: case FormFieldType.selectMultiple: + case FormFieldType.number: return value; case FormFieldType.textEditor3: diff --git a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx index 641747323f..85ef8cf2e0 100644 --- a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx +++ b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx @@ -10,6 +10,8 @@ function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { case FormFieldType.textEditor3: // even though textEditor3 outputs HTML, plaintext has to be used for filtering return FormFieldType.textSingleLine; + case FormFieldType.number: + return FormFieldType.number; case FormFieldType.vocabularySingleValue: return FormFieldType.vocabularySingleValue; case FormFieldType.checkbox: diff --git a/scripts/core/ui/components/generic-form/get-initial-values.tsx b/scripts/core/ui/components/generic-form/get-initial-values.tsx index 444eeb0d57..2c53d7b77a 100644 --- a/scripts/core/ui/components/generic-form/get-initial-values.tsx +++ b/scripts/core/ui/components/generic-form/get-initial-values.tsx @@ -19,6 +19,7 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: case FormFieldType.yesNo: case FormFieldType.select: case FormFieldType.selectMultiple: + case FormFieldType.number: return {[field]: undefined}; case FormFieldType.checkbox: return {[field]: false}; diff --git a/scripts/core/ui/components/generic-form/input-types/number.tsx b/scripts/core/ui/components/generic-form/input-types/number.tsx new file mode 100644 index 0000000000..f40c004b2c --- /dev/null +++ b/scripts/core/ui/components/generic-form/input-types/number.tsx @@ -0,0 +1,42 @@ +import React from 'react'; +import classNames from 'classnames'; +import {IInputType} from '../interfaces/input-types'; + +export class NumberComponent extends React.Component> { + render() { + if (this.props.previewOutput) { + return
{this.props.value}
; + } + + // Default value is required to make it a controlled input. + // Empty string is used instead of a zero to allow for empty values. + const valueWithDefaultValue = this.props.value ?? ''; + + return ( +
0, + 'sd-line-input--required': this.props.formField.required === true, + }, + ) + }> + + this.props.onChange(parseFloat(event.target.value))} + className="sd-line-input__input" + data-test-id={`gform-input--${this.props.formField.field}`} + /> + { + this.props.issues.map((str, i) => ( +
{str}
+ )) + } +
+ ); + } +} diff --git a/scripts/core/ui/components/generic-form/interfaces/form.ts b/scripts/core/ui/components/generic-form/interfaces/form.ts index 7dd7913750..9a4435f024 100644 --- a/scripts/core/ui/components/generic-form/interfaces/form.ts +++ b/scripts/core/ui/components/generic-form/interfaces/form.ts @@ -3,6 +3,7 @@ import {IFormGroup, IFormField, IFormGroupCollapsible} from 'superdesk-api'; export enum FormFieldType { textSingleLine = 'textSingleLine', textEditor3 = 'textEditor3', + number = 'number', vocabularySingleValue = 'vocabularySingleValue', checkbox = 'checkbox', contentFilterSingleValue = 'contentFilterSingleValue', diff --git a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx index 29356d28bf..e6ae601d29 100644 --- a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx +++ b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx @@ -15,6 +15,7 @@ function getTestFieldConfig(type: FormFieldType): IFormField { switch (type) { case FormFieldType.textSingleLine: case FormFieldType.textEditor3: + case FormFieldType.number: case FormFieldType.checkbox: case FormFieldType.contentFilterSingleValue: case FormFieldType.deskSingleValue: From 979490ca30e408eacefc2f929b8ddd6c911aa10e Mon Sep 17 00:00:00 2001 From: Tomas Date: Sat, 16 May 2020 17:29:09 +0200 Subject: [PATCH 0005/1070] initial implementation of non-text content profiles --- package.json | 2 + .../ContentProfileConfigNonText.tsx | 164 ++++++++++++++++++ .../controllers/ContentProfilesController.ts | 21 +++ scripts/apps/workspace/content/index.ts | 2 + .../content/views/profile-settings.html | 15 +- scripts/core/superdesk-api.d.ts | 23 ++- .../generic-form/form-direction-wrapper.tsx | 2 +- 7 files changed, 225 insertions(+), 4 deletions(-) create mode 100644 scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx diff --git a/package.json b/package.json index 58b2ff16c0..f8e6cb1d1d 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "angular-resource": "1.6.9", "angular-route": "1.6.9", "angular-vs-repeat": "1.1.7", + "array-move": "2.2.1", "bootstrap": "3.3.7", "classnames": "2.2.5", "css": "2.2.4", @@ -111,6 +112,7 @@ "react-paginate": "6.3.0", "react-portal": "4.1.3", "react-redux": "5.0.7", + "react-sortable-hoc": "1.11.0", "react-textarea-autosize": "5.2.1", "redux": "4.0.4", "redux-logger": "3.0.6", diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx new file mode 100644 index 0000000000..90920e922e --- /dev/null +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -0,0 +1,164 @@ +/* eslint-disable react/no-multi-comp */ +import React from 'react'; +import {IContentProfileNonText, IFormGroup, IFormField, IContentProfileField, IArrayKeyed} from 'superdesk-api'; +import {SortableContainer, SortableElement, arrayMove} from 'react-sortable-hoc'; +import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; +import {gettext} from 'core/utils'; +import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; +import {Button} from 'superdesk-ui-framework'; + +interface IProps { + profile: IContentProfileNonText; +} + +interface IState { + fields: IArrayKeyed; +} + +class FieldComponent extends React.PureComponent<{ + field: IArrayKeyed[0], + onChange(field: IArrayKeyed[0]): void; + onRemove(): void} +> { + render() { + const {field} = this.props; + + const idField: IFormField = { + label: gettext('ID'), + type: FormFieldType.textSingleLine, + field: 'id', + required: true, + }; + + const labelField: IFormField = { + label: gettext('Label'), + type: FormFieldType.textSingleLine, + field: 'label', + required: true, + }; + + const requiredField: IFormField = { + label: gettext('Required'), + type: FormFieldType.checkbox, + field: 'required', + required: false, + }; + + const formConfig: IFormGroup = { + direction: 'vertical', + type: 'inline', + form: [labelField, idField, requiredField], + }; + + return ( +
+ { + this.props.onChange({...field, value: {...field.value, [key]: value}}); + }} + issues={{}} + /> +
+ ); + } +} + +const FieldSortable = SortableElement(FieldComponent); + +class FieldsComponent extends React.Component<{ + fields: IArrayKeyed; + onChange(fields: IArrayKeyed): void; +}> { + render() { + const {fields} = this.props; + + return ( +
+ { + fields.map((field, index) => ( + { + const fieldsNext = this.props.fields.map((f) => f.key === _field.key ? _field : f); + + this.props.onChange(fieldsNext); + }} + onRemove={() => { + this.props.onChange(fields.filter((f) => f.key !== field.key)); + }} + /> + )) + } +
+ ); + } +} + +const FieldsSortable = SortableContainer(FieldsComponent); + +export class ContentProfileConfigNonText extends React.Component { + private generateKey: () => string; + private lastKey: number; + + constructor(props: IProps) { + super(props); + + this.lastKey = 0; + this.generateKey = () => (++this.lastKey).toString(); + + this.state = { + fields: (props.profile.fields ?? []).map( + (field) => ({key: this.generateKey(), value: field}), + ), + }; + } + + componentDidUpdate() { + this.props.profile.fields = this.state.fields.map(({value}) => value); + } + + render() { + const {fields} = this.state; + + return ( +
+
+ ); + } +} diff --git a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts index eada49eb94..c74370bcb3 100644 --- a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts +++ b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts @@ -2,6 +2,16 @@ import {cloneDeep, get, isEqual} from 'lodash'; import {gettext} from 'core/utils'; import {IContentProfile} from 'superdesk-api'; import {appConfig} from 'appConfig'; +import {assertNever} from 'core/helpers/typescript-helpers'; + +export enum IContentProfileTypeNonText { + image = 'image', + video = 'video', +} + +function getAllContentProfileTypes(): Array { + return Object.keys(IContentProfileTypeNonText).map((key) => IContentProfileTypeNonText[key]); +} ContentProfilesController.$inject = ['$scope', '$location', 'notify', 'content', 'modal', '$q']; export function ContentProfilesController($scope, $location, notify, content, modal, $q) { @@ -33,6 +43,17 @@ export function ContentProfilesController($scope, $location, notify, content, mo }); }; + $scope.contentProfileTypes = getAllContentProfileTypes().map((type) => { + switch (type) { + case IContentProfileTypeNonText.image: + return {label: gettext('Image'), value: IContentProfileTypeNonText.image}; + case IContentProfileTypeNonText.video: + return {label: gettext('Video'), value: IContentProfileTypeNonText.video}; + default: + return assertNever(type); + } + }); + $scope.withEditor3 = appConfig.features != null && appConfig.features.editor3; /** diff --git a/scripts/apps/workspace/content/index.ts b/scripts/apps/workspace/content/index.ts index cd97f1ba33..db1f7ae647 100644 --- a/scripts/apps/workspace/content/index.ts +++ b/scripts/apps/workspace/content/index.ts @@ -7,6 +7,7 @@ import {WidgetsConfig} from './components/WidgetsConfig'; import {gettext} from 'core/utils'; import ContentProfileFields from './controllers/ContentProfileFields'; import {ContentProfilesController} from './controllers/ContentProfilesController'; +import {ContentProfileConfigNonText} from './components/ContentProfileConfigNonText'; /** * @ngdoc module @@ -31,6 +32,7 @@ angular.module('superdesk.apps.workspace.content', [ .directive('sdSortContentProfiles', directive.SortContentProfiles) .component('sdWidgetsConfig', reactToAngular1(WidgetsConfig, ['initialWidgetsConfig', 'onUpdate'])) + .component('sdContentProfileConfigNonText', reactToAngular1(ContentProfileConfigNonText, ['profile'])) .component('sdSchemaEditorFieldsDropdown', { template: require('./views/schema-editor-fields-dropdown.html'), bindings: { diff --git a/scripts/apps/workspace/content/views/profile-settings.html b/scripts/apps/workspace/content/views/profile-settings.html index 8dc772b74f..ea568144d9 100644 --- a/scripts/apps/workspace/content/views/profile-settings.html +++ b/scripts/apps/workspace/content/views/profile-settings.html @@ -61,6 +61,15 @@

Add New Content Profile

+
+
+ + +
+
@@ -111,7 +120,7 @@

{{ :: 'Editing' | translate }} "{{ editing.form.label

-
+
{{ :: 'Editing' | translate }} "{{ editing.form.label
+ +
+ +
diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 604c8366c2..5bdf241dad 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -18,6 +18,8 @@ declare module 'superdesk-api' { export type Omit = Pick>; + export type IArrayKeyed = Array<{key: string; value: T}>; + // EXTENSIONS @@ -545,6 +547,7 @@ declare module 'superdesk-api' { export interface IContentProfile { _id: string; + type: 'text'; label: string; description: string; schema: Object; @@ -553,8 +556,24 @@ declare module 'superdesk-api' { priority: number; enabled: boolean; is_used: boolean; - created_by: string; - updated_by: string; + created_by: IUser['_id']; + updated_by: IUser['_id']; + } + + export interface IContentProfileField { + id: string; + label: string; + required: boolean; + } + + export enum IContentProfileTypeNonText { + image = 'image', + video = 'video', + } + + export interface IContentProfileNonText { + type: keyof typeof IContentProfileTypeNonText; + fields: Array; } diff --git a/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx b/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx index 36c827a754..0dd66f438b 100644 --- a/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx +++ b/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx @@ -21,7 +21,7 @@ export class FormGroupDirectionWrapper extends React.Component { ? `${currentClassname} form-group-horizontal` : 'form-group-horizontal'; - return
; + return
{this.props.children}
; } else { assertNever(direction); } From 0ff1ccc35c959bc3d22bf356c4ea9bde63aee738 Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 18 May 2020 12:19:13 +0200 Subject: [PATCH 0006/1070] implement different profile schemas based on profile type --- .../ContentProfileConfigNonText.tsx | 117 +++++++++++++----- .../controllers/ContentProfilesController.ts | 2 +- scripts/apps/workspace/content/index.ts | 5 +- .../content/views/profile-settings.html | 2 +- 4 files changed, 95 insertions(+), 31 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 90920e922e..4509b094db 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -6,49 +6,107 @@ import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; import {gettext} from 'core/utils'; import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; import {Button} from 'superdesk-ui-framework'; +import {IContentProfileTypeNonText} from '../controllers/ContentProfilesController'; +import {assertNever} from 'core/helpers/typescript-helpers'; interface IProps { profile: IContentProfileNonText; + profileType: keyof typeof IContentProfileTypeNonText; } interface IState { fields: IArrayKeyed; } +function getImageFormConfig(): IFormGroup { + const idField: IFormField = { + label: gettext('ID'), + type: FormFieldType.textSingleLine, + field: 'id', + required: true, + }; + + const labelField: IFormField = { + label: gettext('Label'), + type: FormFieldType.textSingleLine, + field: 'label', + required: true, + }; + + const requiredField: IFormField = { + label: gettext('Required'), + type: FormFieldType.checkbox, + field: 'required', + required: false, + }; + + const displayInMediaEditor: IFormField = { + label: gettext('Display in media editor'), + type: FormFieldType.checkbox, + field: 'displayOnMediaEditor', + required: false, + }; + + const formConfig: IFormGroup = { + direction: 'vertical', + type: 'inline', + form: [labelField, idField, requiredField, displayInMediaEditor], + }; + + return formConfig; +} + +function getVideoFormConfig(): IFormGroup { + const idField: IFormField = { + label: gettext('ID'), + type: FormFieldType.textSingleLine, + field: 'id', + required: true, + }; + + const labelField: IFormField = { + label: gettext('Label'), + type: FormFieldType.textSingleLine, + field: 'label', + required: true, + }; + + const requiredField: IFormField = { + label: gettext('Required'), + type: FormFieldType.checkbox, + field: 'required', + required: false, + }; + + const formConfig: IFormGroup = { + direction: 'vertical', + type: 'inline', + form: [labelField, idField, requiredField], + }; + + return formConfig; +} + +function getFormConfig(type: IContentProfileTypeNonText): IFormGroup { + switch (type) { + case IContentProfileTypeNonText.image: + return getImageFormConfig(); + case IContentProfileTypeNonText.video: + return getVideoFormConfig(); + default: + return assertNever(type); + } +} + class FieldComponent extends React.PureComponent<{ - field: IArrayKeyed[0], + field: IArrayKeyed[0]; + profileType: IContentProfileTypeNonText; onChange(field: IArrayKeyed[0]): void; onRemove(): void} > { render() { const {field} = this.props; - - const idField: IFormField = { - label: gettext('ID'), - type: FormFieldType.textSingleLine, - field: 'id', - required: true, - }; - - const labelField: IFormField = { - label: gettext('Label'), - type: FormFieldType.textSingleLine, - field: 'label', - required: true, - }; - - const requiredField: IFormField = { - label: gettext('Required'), - type: FormFieldType.checkbox, - field: 'required', - required: false, - }; - - const formConfig: IFormGroup = { - direction: 'vertical', - type: 'inline', - form: [labelField, idField, requiredField], - }; + const formConfig = getFormConfig(this.props.profileType); return (
; + profileType: IContentProfileTypeNonText; onChange(fields: IArrayKeyed): void; }> { render() { @@ -91,6 +150,7 @@ class FieldsComponent extends React.Component<{ key={field.key} index={index} field={field} + profileType={this.props.profileType} onChange={(_field) => { const fieldsNext = this.props.fields.map((f) => f.key === _field.key ? _field : f); @@ -149,6 +209,7 @@ export class ContentProfileConfigNonText extends React.Component { this.setState({fields: _fields}); }} diff --git a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts index c74370bcb3..da58046fc2 100644 --- a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts +++ b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts @@ -9,7 +9,7 @@ export enum IContentProfileTypeNonText { video = 'video', } -function getAllContentProfileTypes(): Array { +export function getAllContentProfileTypes(): Array { return Object.keys(IContentProfileTypeNonText).map((key) => IContentProfileTypeNonText[key]); } diff --git a/scripts/apps/workspace/content/index.ts b/scripts/apps/workspace/content/index.ts index db1f7ae647..707389e44c 100644 --- a/scripts/apps/workspace/content/index.ts +++ b/scripts/apps/workspace/content/index.ts @@ -32,7 +32,10 @@ angular.module('superdesk.apps.workspace.content', [ .directive('sdSortContentProfiles', directive.SortContentProfiles) .component('sdWidgetsConfig', reactToAngular1(WidgetsConfig, ['initialWidgetsConfig', 'onUpdate'])) - .component('sdContentProfileConfigNonText', reactToAngular1(ContentProfileConfigNonText, ['profile'])) + .component( + 'sdContentProfileConfigNonText', + reactToAngular1(ContentProfileConfigNonText, ['profile', 'profileType']), + ) .component('sdSchemaEditorFieldsDropdown', { template: require('./views/schema-editor-fields-dropdown.html'), bindings: { diff --git a/scripts/apps/workspace/content/views/profile-settings.html b/scripts/apps/workspace/content/views/profile-settings.html index ea568144d9..4300c7f937 100644 --- a/scripts/apps/workspace/content/views/profile-settings.html +++ b/scripts/apps/workspace/content/views/profile-settings.html @@ -153,7 +153,7 @@

{{ :: 'Editing' | translate }} "{{ editing.form.label

- +
From 6766d299e3667614c1a9320552269a2c41ee8cbd Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 18 May 2020 14:33:46 +0200 Subject: [PATCH 0007/1070] introduce field attributes --- .../ContentProfileConfigNonText.tsx | 85 ++++++++++++++++++- scripts/core/superdesk-api.d.ts | 7 ++ .../select_single_value_static.tsx | 8 +- 3 files changed, 94 insertions(+), 6 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 4509b094db..9287079c90 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -18,6 +18,16 @@ interface IState { fields: IArrayKeyed; } +// subset of FormFieldType +enum IContentProfileFieldTypes { + textSingleLine = 'textSingleLine', + number = 'number', +} + +function getAllContentProfileFieldTypes(): Array { + return Object.keys(IContentProfileFieldTypes).map((key) => IContentProfileFieldTypes[key]); +} + function getImageFormConfig(): IFormGroup { const idField: IFormField = { label: gettext('ID'), @@ -33,6 +43,31 @@ function getImageFormConfig(): IFormGroup { required: true, }; + const fieldType: IFormField = { + label: gettext('Field type'), + type: FormFieldType.select, + component_parameters: { + items: getAllContentProfileFieldTypes().map((type) => { + switch (type) { + case IContentProfileFieldTypes.textSingleLine: + return { + id: IContentProfileFieldTypes.textSingleLine, + label: gettext('Plain text (single line)'), + }; + case IContentProfileFieldTypes.number: + return { + id: IContentProfileFieldTypes.number, + label: gettext('Number'), + }; + default: + return assertNever(type); + } + }), + }, + field: 'type', + required: true, + }; + const requiredField: IFormField = { label: gettext('Required'), type: FormFieldType.checkbox, @@ -50,7 +85,7 @@ function getImageFormConfig(): IFormGroup { const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [labelField, idField, requiredField, displayInMediaEditor], + form: [labelField, idField, fieldType, requiredField, displayInMediaEditor], }; return formConfig; @@ -98,6 +133,35 @@ function getFormConfig(type: IContentProfileTypeNonText): IFormGroup { } } +function getAttributesForTextSingleLine(): Array { + const minLengthField: IFormField = { + label: gettext('Minimum length'), + type: FormFieldType.number, + field: 'minlength', + required: false, + }; + + const maxLengthField: IFormField = { + label: gettext('Maximum length'), + type: FormFieldType.number, + field: 'maxlength', + required: false, + }; + + return [minLengthField, maxLengthField]; +} + +export function getAttributesForFormFieldType(type: IContentProfileFieldTypes): Array { + switch (type) { + case IContentProfileFieldTypes.textSingleLine: + return getAttributesForTextSingleLine(); + case IContentProfileFieldTypes.number: + return []; + default: + assertNever(type); + } +} + class FieldComponent extends React.PureComponent<{ field: IArrayKeyed[0]; profileType: IContentProfileTypeNonText; @@ -108,6 +172,20 @@ class FieldComponent extends React.PureComponent<{ const {field} = this.props; const formConfig = getFormConfig(this.props.profileType); + if (field.value.type != null) { + const fieldAttributes = getAttributesForFormFieldType(IContentProfileFieldTypes[field.value.type]); + + if (fieldAttributes.length > 0) { + const attributesFormGroup: IFormGroup = { + direction: 'vertical', + type: 'inline', + form: fieldAttributes, + }; + + formConfig.form.push(attributesFormGroup); + } + } + return (
onClick={() => { this.setState({ fields: [ - {key: this.generateKey(), value: {id: '', label: '', required: false}}, + { + key: this.generateKey(), + value: {id: '', label: '', type: 'textSingleLine', required: false}, + }, ...fields, ], }); diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 5bdf241dad..036bbd8db5 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -560,9 +560,16 @@ declare module 'superdesk-api' { updated_by: IUser['_id']; } + // subset of FormFieldType + export enum IContentProfileFieldTypes { + textSingleLine = 'textSingleLine', + number = 'number', + } + export interface IContentProfileField { id: string; label: string; + type: keyof typeof IContentProfileFieldTypes; required: boolean; } diff --git a/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx b/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx index 77aca2c7b3..e013c4aa43 100644 --- a/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx +++ b/scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx @@ -2,7 +2,7 @@ import React from 'react'; import classNames from 'classnames'; import {IInputType} from '../interfaces/input-types'; -type IProps = IInputType; +type IProps = IInputType; export class SelectSingleValue extends React.Component { render() { @@ -35,7 +35,7 @@ export class SelectSingleValue extends React.Component { disabled={this.props.disabled || items == null || items.length < 1} value={this.props.value ?? ''} onChange={(event) => { - this.props.onChange(event.target.value); + this.props.onChange(event.target.value === '' ? null : event.target.value); }} data-test-id={`gform-input--${this.props.formField.field}`} > @@ -43,8 +43,8 @@ export class SelectSingleValue extends React.Component { { items == null ? null - : items.map(({id, label}, i) => ( - + : items.map(({id, label}) => ( + )) } From c3613461472a001cfefbae350d3a7a82fbbd4df6 Mon Sep 17 00:00:00 2001 From: Tomas Date: Mon, 18 May 2020 16:39:33 +0200 Subject: [PATCH 0008/1070] add width field --- .../components/ContentProfileConfigNonText.tsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 9287079c90..75b28aa347 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -43,6 +43,20 @@ function getImageFormConfig(): IFormGroup { required: true, }; + const sdWidth: IFormField = { + label: gettext('Width'), + type: FormFieldType.select, + component_parameters: { + items: [ + {id: 'full', label: gettext('Full')}, + {id: 'half', label: gettext('Half')}, + {id: 'quarter', label: gettext('Quarter')}, + ], + }, + field: 'sdWidth', + required: true, + }; + const fieldType: IFormField = { label: gettext('Field type'), type: FormFieldType.select, @@ -85,7 +99,7 @@ function getImageFormConfig(): IFormGroup { const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [labelField, idField, fieldType, requiredField, displayInMediaEditor], + form: [labelField, idField, sdWidth, fieldType, requiredField, displayInMediaEditor], }; return formConfig; From 0977c73f83d1e2a48e1b0ef56616bb2d718b14b5 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 21 May 2020 16:04:43 +0200 Subject: [PATCH 0009/1070] don't require the entire IBaseRestApiResponse. IItemWithId is enough. --- scripts/core/helpers/CrudManager.tsx | 1 - scripts/core/superdesk-api.d.ts | 32 +++++++++++++------ .../components/ListPage/generic-list-page.tsx | 9 +++--- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/scripts/core/helpers/CrudManager.tsx b/scripts/core/helpers/CrudManager.tsx index 914b823616..7425be22ad 100644 --- a/scripts/core/helpers/CrudManager.tsx +++ b/scripts/core/helpers/CrudManager.tsx @@ -226,7 +226,6 @@ export function connectCrudManager> { + export interface IPropsGenericForm> { formConfig: IFormGroup; defaultSortOption: ISortOption; defaultFilters?: Partial; @@ -741,29 +741,41 @@ declare module 'superdesk-api' { direction: 'ascending' | 'descending'; } + export interface IItemWithId { + _id: string; + } + + export interface ICrudManagerResponse { + _items: Array; + _meta: { + max_results: number; + page: number; + total: number; + }; + } - export interface ICrudManagerState extends IRestApiResponse { + export interface ICrudManagerState extends ICrudManagerResponse { activeFilters: ICrudManagerFilters; activeSortOption?: ISortOption; } - export interface ICrudManagerMethods { + export interface ICrudManagerMethods { read( page: number, sort: ISortOption, filterValues?: ICrudManagerFilters, - ): Promise>; + ): Promise>; update(item: Entity): Promise; create(item: Entity): Promise; delete(item: Entity): Promise; - refresh(): Promise>; - sort(nextSortOption: ISortOption): Promise>; - removeFilter(fieldName: string): Promise>; - goToPage(nextPage: number): Promise>; + refresh(): Promise>; + sort(nextSortOption: ISortOption): Promise>; + removeFilter(fieldName: string): Promise>; + goToPage(nextPage: number): Promise>; } - export interface ICrudManager extends ICrudManagerState, ICrudManagerMethods { + export interface ICrudManager extends ICrudManagerState, ICrudManagerMethods { // allow exposing it as one interface for consumer components } @@ -830,7 +842,7 @@ declare module 'superdesk-api' { onClose?(): void; } - export interface IGenericListPageComponent> { + export interface IGenericListPageComponent> { openPreview(id: string): void; startEditing(id: string): void; closePreview(): void; diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 38eacd8168..5849156d38 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -28,15 +28,16 @@ import {getInitialValues} from '../generic-form/get-initial-values'; import {generateFilterForServer} from '../generic-form/generate-filter-for-server'; import {getFormFieldsFlat} from '../generic-form/get-form-fields-flat'; import { - IBaseRestApiResponse, + IItemWithId, IPropsGenericForm, IGenericListPageComponent, ICrudManager, IFormGroup, + IBaseRestApiResponse, } from 'superdesk-api'; import {gettext} from 'core/utils'; -interface IState> { +interface IState> { previewItemId: string | null; editItemId: string | null; newItem: {[key: string]: any} | null; @@ -46,14 +47,14 @@ interface IState { +interface IPropsConnected { items?: ICrudManager; modal: any; notify: any; $rootScope: any; } -export class GenericListPageComponent +export class GenericListPageComponent extends React.Component & IPropsConnected, IState> implements IGenericListPageComponent { From 686449d642f3ea4984e0f19a99df656fd1667468 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 09:52:22 +0200 Subject: [PATCH 0010/1070] check if the component is mounted --- .../generic-list-page-item-view-edit.tsx | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index b68169020f..96674f4c37 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -40,6 +40,8 @@ const getInitialState = (props: IProps) => ({ }); class GenericListPageItemViewEditComponent extends React.Component { + _mounted: boolean; + constructor(props) { super(props); @@ -51,6 +53,12 @@ class GenericListPageItemViewEditComponent extends React.Component { - this.setState({ - issues: {}, - }, () => { - this.props.onEditModeChange(false); - }); + if (this._mounted) { + this.setState({ + issues: {}, + }, () => { + this.props.onEditModeChange(false); + }); + } }) .catch((res) => { if (isHttpApiError(res)) { From 55a8de130f84193d6747273aaf0a62106147e465 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 10:05:42 +0200 Subject: [PATCH 0011/1070] id won't be present when creating a new item --- scripts/core/superdesk-api.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index ba8d641fa0..bc04714640 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -766,7 +766,7 @@ declare module 'superdesk-api' { filterValues?: ICrudManagerFilters, ): Promise>; update(item: Entity): Promise; - create(item: Entity): Promise; + create(item: Omit): Promise; delete(item: Entity): Promise; refresh(): Promise>; sort(nextSortOption: ISortOption): Promise>; From 4683435ad5c88b74599d4fc65af3a4e6b5d86c5a Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 10:06:39 +0200 Subject: [PATCH 0012/1070] get services in constructor instead of passing as props --- .../components/ListPage/generic-list-page.tsx | 77 ++++++++++--------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 5849156d38..8096245429 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -20,7 +20,6 @@ import {Button} from 'core/ui/components/Nav'; import {SortBar, ISortFields} from 'core/ui/components/SortBar'; import {connectCrudManager} from 'core/helpers/CrudManager'; import {TagLabel} from 'core/ui/components/TagLabel'; -import {connectServices} from 'core/helpers/ReactRenderAsync'; import {getFormGroupForFiltering} from 'core/ui/components/generic-form/get-form-group-for-filtering'; import {getFormFieldsRecursive, getFormFieldPreviewComponent} from 'core/ui/components/generic-form/form-field'; import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; @@ -36,6 +35,7 @@ import { IBaseRestApiResponse, } from 'superdesk-api'; import {gettext} from 'core/utils'; +import ng from 'core/services/ng'; interface IState> { previewItemId: string | null; @@ -47,11 +47,8 @@ interface IState> { refetchDataScheduled: boolean; } -interface IPropsConnected { +export interface IPropsConnected { items?: ICrudManager; - modal: any; - notify: any; - $rootScope: any; } export class GenericListPageComponent @@ -59,6 +56,9 @@ export class GenericListPageComponent implements IGenericListPageComponent { searchBarRef: SearchBar | null; + modal: any; + notify: any; + $rootScope: any; constructor(props: IPropsGenericForm & IPropsConnected) { super(props); @@ -89,17 +89,21 @@ export class GenericListPageComponent this.removeFilter = this.removeFilter.bind(this); this.refetchDataUsingCurrentFilters = this.refetchDataUsingCurrentFilters.bind(this); this.filter = this.filter.bind(this); + + this.modal = ng.get('modal'); + this.notify = ng.get('notify'); + this.$rootScope = ng.get('$rootScope'); } openPreview(id) { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t open a preview while in edit mode', ), }); } else if (this.state.newItem != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t open a preview while in create mode', @@ -135,13 +139,13 @@ export class GenericListPageComponent } deleteItem(item: T) { const deleteNow = () => this.props.items.delete(item).then(() => { - this.props.notify.success(gettext('The item has been deleted.')); + this.notify.success(gettext('The item has been deleted.')); }); - this.props.modal.confirm(gettext('Are you sure you want to delete this item?')) + this.modal.confirm(gettext('Are you sure you want to delete this item?')) .then(() => { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Edit mode must closed before you can delete an item.', @@ -158,7 +162,7 @@ export class GenericListPageComponent } startEditing(id: string) { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t edit this item, because another item is in edit mode.', @@ -223,7 +227,7 @@ export class GenericListPageComponent } filter() { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'The item in edit mode must be closed before you can filter.', @@ -272,7 +276,7 @@ export class GenericListPageComponent } openNewItemForm() { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t add a new item, because another item is in edit mode.', @@ -295,7 +299,7 @@ export class GenericListPageComponent if (this.props.refreshOnEvents != null) { this.props.refreshOnEvents.forEach((eventName) => { - this.props.$rootScope.$on(eventName, () => { + this.$rootScope.$on(eventName, () => { // will update the list using selected filtering / sort options this.refetchDataUsingCurrentFilters(); }); @@ -559,7 +563,7 @@ export class GenericListPageComponent }} item={this.state.newItem} onSave={(item: T) => this.props.items.create(item).then((res) => { - this.props.notify.success(gettext('The item has been created.')); + this.notify.success(gettext('The item has been created.')); this.closeNewItemForm(); this.openPreview(res._id); })} @@ -584,7 +588,7 @@ export class GenericListPageComponent this.props.items._items.find(({_id}) => _id === this.state.editItemId) } onSave={(nextItem) => this.props.items.update(nextItem).then(() => { - this.props.notify.success(gettext('The item has been updated.')); + this.notify.success(gettext('The item has been updated.')); })} onClose={this.closePreview} /> @@ -619,27 +623,24 @@ export class GenericListPageComponent export const getGenericListPageComponent = (resource: string, formConfig: IFormGroup) => - connectServices>( - connectCrudManager, IPropsConnected, T>( - GenericListPageComponent, - 'items', - resource, - (filters: IFormGroup) => { - const formConfigForFilters = getFormGroupForFiltering(formConfig); - const fieldTypesLookup = getFormFieldsFlat(formConfigForFilters) - .reduce((accumulator, item) => ({...accumulator, ...{[item.field]: item.type}}), {}); - - let filtersFormatted = {}; - - for (let fieldName in filters) { - filtersFormatted[fieldName] = generateFilterForServer( - fieldTypesLookup[fieldName], - filters[fieldName], - ); - } + connectCrudManager, IPropsConnected, T>( + GenericListPageComponent, + 'items', + resource, + (filters: IFormGroup) => { + const formConfigForFilters = getFormGroupForFiltering(formConfig); + const fieldTypesLookup = getFormFieldsFlat(formConfigForFilters) + .reduce((accumulator, item) => ({...accumulator, ...{[item.field]: item.type}}), {}); + + let filtersFormatted = {}; + + for (let fieldName in filters) { + filtersFormatted[fieldName] = generateFilterForServer( + fieldTypesLookup[fieldName], + filters[fieldName], + ); + } - return filtersFormatted; - }, - ) - , ['modal', '$rootScope', 'notify'], + return filtersFormatted; + }, ); From 47a20ebb5459298b092ce2e5b2eb77708a4f070a Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 10:16:22 +0200 Subject: [PATCH 0013/1070] use GenericListPageComponent --- .../ContentProfileConfigNonText.tsx | 204 +++++++++--------- 1 file changed, 100 insertions(+), 104 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 75b28aa347..26392275df 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -1,13 +1,21 @@ /* eslint-disable react/no-multi-comp */ import React from 'react'; -import {IContentProfileNonText, IFormGroup, IFormField, IContentProfileField, IArrayKeyed} from 'superdesk-api'; -import {SortableContainer, SortableElement, arrayMove} from 'react-sortable-hoc'; -import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; +import { + IContentProfileNonText, + IFormGroup, + IFormField, + IContentProfileField, + IArrayKeyed, + ICrudManager, + ICrudManagerResponse, + IItemWithId, +} from 'superdesk-api'; + import {gettext} from 'core/utils'; import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; -import {Button} from 'superdesk-ui-framework'; import {IContentProfileTypeNonText} from '../controllers/ContentProfilesController'; import {assertNever} from 'core/helpers/typescript-helpers'; +import {GenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; interface IProps { profile: IContentProfileNonText; @@ -176,91 +184,27 @@ export function getAttributesForFormFieldType(type: IContentProfileFieldTypes): } } -class FieldComponent extends React.PureComponent<{ - field: IArrayKeyed[0]; - profileType: IContentProfileTypeNonText; - onChange(field: IArrayKeyed[0]): void; - onRemove(): void} -> { - render() { - const {field} = this.props; - const formConfig = getFormConfig(this.props.profileType); +const renderRow = ( + key: string, + item: IContentProfileFieldWithSystemId, + page: GenericListPageComponent, +) => ( +
+ {item.label} + +
+); - if (field.value.type != null) { - const fieldAttributes = getAttributesForFormFieldType(IContentProfileFieldTypes[field.value.type]); +type IContentProfileFieldWithSystemId = IContentProfileField & IItemWithId; - if (fieldAttributes.length > 0) { - const attributesFormGroup: IFormGroup = { - direction: 'vertical', - type: 'inline', - form: fieldAttributes, - }; +function stripSystemId(item: IContentProfileFieldWithSystemId): IContentProfileField { + const copy = {...item}; - formConfig.form.push(attributesFormGroup); - } - } + delete copy['_id']; - return ( -
- { - this.props.onChange({...field, value: {...field.value, [key]: value}}); - }} - issues={{}} - /> -
- ); - } + return copy; } -const FieldSortable = SortableElement(FieldComponent); - -class FieldsComponent extends React.Component<{ - fields: IArrayKeyed; - profileType: IContentProfileTypeNonText; - onChange(fields: IArrayKeyed): void; -}> { - render() { - const {fields} = this.props; - - return ( -
- { - fields.map((field, index) => ( - { - const fieldsNext = this.props.fields.map((f) => f.key === _field.key ? _field : f); - - this.props.onChange(fieldsNext); - }} - onRemove={() => { - this.props.onChange(fields.filter((f) => f.key !== field.key)); - }} - /> - )) - } -
- ); - } -} - -const FieldsSortable = SortableContainer(FieldsComponent); - export class ContentProfileConfigNonText extends React.Component { private generateKey: () => string; private lastKey: number; @@ -285,34 +229,86 @@ export class ContentProfileConfigNonText extends React.Component render() { const {fields} = this.state; - return ( -
- - -
- - -); + { + item.is_active ? null : ( + + {gettext('Inactive')} + + ) + } + +
+ + +
+ + + ); + } +} export class InternalDestinations extends React.Component { render() { @@ -144,7 +145,7 @@ export class InternalDestinations extends React.Component { return ( , -) => ( -
- {item.label} - -
-); +class ItemComponent extends React.PureComponent> { + render() { + const {item, page} = this.props; + + return ( +
+ {item.label} + +
+ ); + } +} type IContentProfileFieldWithSystemId = IContentProfileField & IItemWithId; @@ -306,7 +309,7 @@ export class ContentProfileConfigNonText extends React.Component diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 744a0f800a..452f75f06a 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -672,12 +672,17 @@ declare module 'superdesk-api' { // GENERIC FORM + export interface IGenericFormItemComponent { + item: T; + page: IGenericListPageComponent; + } + export interface IPropsGenericForm> { formConfig: IFormGroup; defaultSortOption: ISortOption; additionalSortOptions?: Array<{label: string; field: string;}>; defaultFilters?: Partial; - renderRow(key: string, item: T, page: IGenericListPageComponent): JSX.Element; + ItemComponent: React.ComponentType; // Allows initializing a new item with some fields already filled. getNewItemTemplate?(page: IGenericListPageComponent): Partial; diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 1407161015..f8b48648d3 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -323,7 +323,7 @@ export class GenericListPageComponent const pageSize = this.props.items._meta.max_results; const pageCount = Math.ceil(totalResults / pageSize); - const {formConfig, renderRow} = this.props; + const {formConfig, ItemComponent} = this.props; const formConfigForFilters = getFormGroupForFiltering(formConfig); const fieldsList = getFormFieldsRecursive(formConfig.form); @@ -360,7 +360,7 @@ export class GenericListPageComponent > { this.props.items._items.map( - (item) => renderRow(item._id, item, this), + (item) => , ) }
diff --git a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx index 38dd0c6e5c..4edf93c0de 100644 --- a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx +++ b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx @@ -1,8 +1,10 @@ +/* eslint-disable react/no-multi-comp */ + import * as React from 'react'; import { IFormGroup, - IGenericListPageComponent, ISuperdesk, + IGenericFormItemComponent, } from 'superdesk-api'; import {IKnowledgeBaseItem, IKnowledgeBaseItemBase} from './interfaces'; import {getFields} from './GetFields'; @@ -38,49 +40,51 @@ export function getAnnotationsLibraryPage(superdesk: ISuperdesk) { const AnnotationsLibraryPageComponent = getGenericListPageComponent('concept_items', formConfig); - const renderRow = ( - key: string, - item: IKnowledgeBaseItem, - page: IGenericListPageComponent, - ) => ( - page.openPreview(item._id)}> - - {getFormFieldPreviewComponent(item, nameField)} - - - {getFormFieldPreviewComponent(item, definitionField, {showAsPlainText: true})} - - -
- + class ItemComponent extends React.PureComponent> { + render() { + const {item, page} = this.props; - -
- - - ); + return ( + page.openPreview(item._id)}> + + {getFormFieldPreviewComponent(item, nameField)} + + + {getFormFieldPreviewComponent(item, definitionField, {showAsPlainText: true})} + + +
+ + + +
+ + + ); + } + } return ( { const baseTemplate: Partial = { cpnat_type: 'cpnat:abstract', From dab4410b74fe4706ea1f96c7637339f58089d1bf Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 13:38:13 +0200 Subject: [PATCH 0016/1070] implement sorting --- .../InternalDestinations.tsx | 4 +- .../ContentProfileConfigNonText.tsx | 56 ++++++++++++++++++- scripts/core/superdesk-api.d.ts | 6 +- .../components/ListPage/generic-list-page.tsx | 23 ++++++-- .../src/annotations-library-page.tsx | 4 +- 5 files changed, 78 insertions(+), 15 deletions(-) diff --git a/scripts/apps/internal-destinations/InternalDestinations.tsx b/scripts/apps/internal-destinations/InternalDestinations.tsx index 364701e532..06acd52ced 100644 --- a/scripts/apps/internal-destinations/InternalDestinations.tsx +++ b/scripts/apps/internal-destinations/InternalDestinations.tsx @@ -5,7 +5,7 @@ import {getGenericListPageComponent} from 'core/ui/components/ListPage/generic-l import {ListItemColumn, ListItemActionsMenu, ListItem} from 'core/components/ListItem'; import {getFormFieldPreviewComponent} from 'core/ui/components/generic-form/form-field'; import {IInternalDestination} from 'superdesk-interfaces/InternalDestination'; -import {IFormField, IFormGroup, IGenericFormItemComponent} from 'superdesk-api'; +import {IFormField, IFormGroup, IPropsGenericFormItemComponent} from 'superdesk-api'; import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; import {gettext} from 'core/utils'; @@ -73,7 +73,7 @@ function getSendAfterScheduleField(): IFormField { }; } -class ItemComponent extends React.PureComponent> { +class ItemComponent extends React.PureComponent> { render() { const {item, page} = this.props; diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index c7171c634c..965a716864 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -9,7 +9,7 @@ import { ICrudManager, ICrudManagerResponse, IItemWithId, - IGenericFormItemComponent, + IPropsGenericFormItemComponent, } from 'superdesk-api'; import {gettext} from 'core/utils'; @@ -17,6 +17,8 @@ import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; import {IContentProfileTypeNonText} from '../controllers/ContentProfilesController'; import {assertNever} from 'core/helpers/typescript-helpers'; import {GenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; +import {SortableContainer, SortableElement} from 'react-sortable-hoc'; +import arrayMove from 'array-move'; interface IProps { profile: IContentProfileNonText; @@ -185,12 +187,12 @@ export function getAttributesForFormFieldType(type: IContentProfileFieldTypes): } } -class ItemComponent extends React.PureComponent> { +class ItemBase extends React.PureComponent> { render() { const {item, page} = this.props; return ( -
+
{item.label}
@@ -198,6 +200,34 @@ class ItemComponent extends React.PureComponent> { + render() { + const {item, page, index} = this.props; + + return ( + + ); + } +} + +class ItemsContainerBase extends React.PureComponent { + render() { + return ( +
+ {this.props.children} +
+ ); + } +} + +const ItemsContainerBaseSortable = SortableContainer(ItemsContainerBase); + type IContentProfileFieldWithSystemId = IContentProfileField & IItemWithId; function stripSystemId(item: IContentProfileFieldWithSystemId): IContentProfileField { @@ -211,6 +241,7 @@ function stripSystemId(item: IContentProfileFieldWithSystemId): IContentProfileF export class ContentProfileConfigNonText extends React.Component { private generateKey: () => string; private lastKey: number; + private ItemsContainerComponent: React.ComponentType; constructor(props: IProps) { super(props); @@ -223,6 +254,24 @@ export class ContentProfileConfigNonText extends React.Component (field) => ({key: this.generateKey(), value: field}), ), }; + + const onSortEnd = ({oldIndex, newIndex}) => { + this.setState({ + fields: arrayMove(this.state.fields, oldIndex, newIndex), + }); + }; + + class ItemsContainerComponent extends React.PureComponent { + render() { + return ( + + {this.props.children} + + ); + } + } + + this.ItemsContainerComponent = ItemsContainerComponent; } componentDidUpdate() { @@ -310,6 +359,7 @@ export class ContentProfileConfigNonText extends React.Component formConfig={formConfig} defaultSortOption={{field: 'name', direction: 'ascending'}} ItemComponent={ItemComponent} + ItemsContainerComponent={this.ItemsContainerComponent} disallowFiltering items={crudManagerForContentProfileFields} /> diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 452f75f06a..9f40b66f96 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -672,9 +672,10 @@ declare module 'superdesk-api' { // GENERIC FORM - export interface IGenericFormItemComponent { + export interface IPropsGenericFormItemComponent { item: T; page: IGenericListPageComponent; + index: number; } export interface IPropsGenericForm> { @@ -682,7 +683,8 @@ declare module 'superdesk-api' { defaultSortOption: ISortOption; additionalSortOptions?: Array<{label: string; field: string;}>; defaultFilters?: Partial; - ItemComponent: React.ComponentType; + ItemComponent: React.ComponentType>; + ItemsContainerComponent?: React.ComponentType; // Allows initializing a new item with some fields already filled. getNewItemTemplate?(page: IGenericListPageComponent): Partial; diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index f8b48648d3..c591d8cc6c 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -52,6 +52,19 @@ export interface IPropsConnected { items?: ICrudManager; } +class DefaultItemsContainerComponent extends React.PureComponent { + render() { + return ( +
+ {this.props.children} +
+ ); + } +} + export class GenericListPageComponent extends React.Component & IPropsConnected, IState> implements IGenericListPageComponent @@ -324,6 +337,7 @@ export class GenericListPageComponent const pageCount = Math.ceil(totalResults / pageSize); const {formConfig, ItemComponent} = this.props; + const ItemsContainerComponent = this.props.ItemsContainerComponent ?? DefaultItemsContainerComponent; const formConfigForFilters = getFormGroupForFiltering(formConfig); const fieldsList = getFormFieldsRecursive(formConfig.form); @@ -354,16 +368,13 @@ export class GenericListPageComponent } } else { return ( -
+ { this.props.items._items.map( - (item) => , + (item, i) => , ) } -
+ ); } }; diff --git a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx index 4edf93c0de..3fbc2580f9 100644 --- a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx +++ b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { IFormGroup, ISuperdesk, - IGenericFormItemComponent, + IPropsGenericFormItemComponent, } from 'superdesk-api'; import {IKnowledgeBaseItem, IKnowledgeBaseItemBase} from './interfaces'; import {getFields} from './GetFields'; @@ -40,7 +40,7 @@ export function getAnnotationsLibraryPage(superdesk: ISuperdesk) { const AnnotationsLibraryPageComponent = getGenericListPageComponent('concept_items', formConfig); - class ItemComponent extends React.PureComponent> { + class ItemComponent extends React.PureComponent> { render() { const {item, page} = this.props; From 33fa87758dc64716d9e9355888a8131fe1905113 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 14:11:54 +0200 Subject: [PATCH 0017/1070] show pagination onlu when there is more than one page --- .../components/ListPage/generic-list-page.tsx | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index c591d8cc6c..76fb915e8d 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -326,14 +326,16 @@ export class GenericListPageComponent } } render() { - if (this.props.items._items == null) { + const {items} = this.props; + + if (items._items == null) { // loading return null; } - const {activeFilters} = this.props.items; - const totalResults = this.props.items._meta.total; - const pageSize = this.props.items._meta.max_results; + const {activeFilters} = items; + const totalResults = items._meta.total; + const pageSize = items._meta.max_results; const pageCount = Math.ceil(totalResults / pageSize); const {formConfig, ItemComponent} = this.props; @@ -348,7 +350,7 @@ export class GenericListPageComponent ]; const getContents = () => { - if (this.props.items._items.length === 0) { + if (items._items.length === 0) { if (Object.keys(activeFilters).length > 0) { return ( @@ -370,7 +372,7 @@ export class GenericListPageComponent return ( { - this.props.items._items.map( + items._items.map( (item, i) => , ) } @@ -426,9 +428,9 @@ export class GenericListPageComponent
{ @@ -494,7 +496,7 @@ export class GenericListPageComponent
{ - this.props.items._items.length === 0 ? null : ( + items._meta.max_results === items._meta.total || items._items.length === 0 ? null : (
marginPagesDisplayed={2} pageRangeDisplayed={5} onPageChange={({selected}) => { - if (this.props.items._meta.page !== (selected + 1)) { - this.props.items.goToPage(selected + 1); + if (items._meta.page !== (selected + 1)) { + items.goToPage(selected + 1); } }} - initialPage={this.props.items._meta.page - 1} + initialPage={items._meta.page - 1} containerClassName={'bs-pagination'} activeClassName="active" /> @@ -528,7 +530,7 @@ export class GenericListPageComponent ); const filterValuePreview = getFormFieldPreviewComponent( - this.props.items.activeFilters, + items.activeFilters, currentField, ); @@ -567,7 +569,7 @@ export class GenericListPageComponent })); }} item={this.state.newItem} - onSave={(item: T) => this.props.items.create(item).then((res) => { + onSave={(item: T) => items.create(item).then((res) => { this.notify.success(gettext('The item has been created.')); this.closeNewItemForm(); this.openPreview(res._id); @@ -590,9 +592,9 @@ export class GenericListPageComponent operation="editing" formConfig={formConfig} item={ - this.props.items._items.find(({_id}) => _id === this.state.editItemId) + items._items.find(({_id}) => _id === this.state.editItemId) } - onSave={(nextItem) => this.props.items.update(nextItem).then(() => { + onSave={(nextItem) => items.update(nextItem).then(() => { this.notify.success(gettext('The item has been updated.')); })} onClose={this.closePreview} @@ -612,9 +614,9 @@ export class GenericListPageComponent operation="editing" formConfig={formConfig} item={ - this.props.items._items.find(({_id}) => _id === this.state.previewItemId) + items._items.find(({_id}) => _id === this.state.previewItemId) } - onSave={(nextItem) => this.props.items.update(nextItem)} + onSave={(nextItem) => items.update(nextItem)} onClose={this.closePreview} /> From db536baebdd508efbae503f04a29b32360f67452 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 16:02:24 +0200 Subject: [PATCH 0018/1070] don't render the submenu if it has no items --- .../ContentProfileConfigNonText.tsx | 5 +- scripts/core/superdesk-api.d.ts | 2 +- .../components/ListPage/generic-list-page.tsx | 131 ++++++++++-------- .../core/ui/components/only-with-children.tsx | 57 ++++++++ 4 files changed, 132 insertions(+), 63 deletions(-) create mode 100644 scripts/core/ui/components/only-with-children.tsx diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 965a716864..136cdbf040 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -290,7 +290,6 @@ export class ContentProfileConfigNonText extends React.Component const crudManagerForContentProfileFields: ICrudManager = { activeFilters: {}, - activeSortOption: {field: 'label', direction: 'ascending'}, read: () => Promise.resolve(fieldsResponse), update: (item) => { return new Promise((resolve) => { @@ -357,11 +356,11 @@ export class ContentProfileConfigNonText extends React.Component
); diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 9f40b66f96..2014ad9c9a 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -680,7 +680,7 @@ declare module 'superdesk-api' { export interface IPropsGenericForm> { formConfig: IFormGroup; - defaultSortOption: ISortOption; + defaultSortOption?: ISortOption; additionalSortOptions?: Array<{label: string; field: string;}>; defaultFilters?: Partial; ItemComponent: React.ComponentType>; diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 76fb915e8d..4a2e55c0ce 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -37,6 +37,7 @@ import { } from 'superdesk-api'; import {gettext} from 'core/utils'; import ng from 'core/services/ng'; +import {OnlyWithChildren} from '../only-with-children'; interface IState> { previewItemId: string | null; @@ -65,6 +66,21 @@ class DefaultItemsContainerComponent extends React.PureComponent { } } +const subNavWrapper: React.ComponentType = (props) => ( +
+
+
+ {props.children} +
+
+
+); + export class GenericListPageComponent extends React.Component & IPropsConnected, IState> implements IGenericListPageComponent @@ -383,73 +399,70 @@ export class GenericListPageComponent return (
-
-
+ + { + this.props.disallowFiltering ? null : ( +
+
+ ) + } + + { + this.props.fieldForSearch == null ? null : ( +
+ { + this.searchBarRef = instance; + }} + value="" + allowCollapsed={false} + onSearch={(value) => { + this.handleFilterFieldChange( + this.props.fieldForSearch.field, + value, + this.filter, + ); + }} + /> +
+ ) + } + + { - this.props.disallowFiltering ? null : ( -
-
+ items.activeSortOption == null ? null : ( + ) } { - this.props.fieldForSearch == null ? null : ( -
- { - this.searchBarRef = instance; - }} - value="" - allowCollapsed={false} - onSearch={(value) => { - this.handleFilterFieldChange( - this.props.fieldForSearch.field, - value, - this.filter, - ); - }} - /> + this.props.disallowCreatingNewItem === true ? null : ( +
+
) } - -
- - - { - this.props.disallowCreatingNewItem === true ? null : ( -
- -
- ) - } -
-
-
+ + { this.state.filtersOpen ? ( diff --git a/scripts/core/ui/components/only-with-children.tsx b/scripts/core/ui/components/only-with-children.tsx new file mode 100644 index 0000000000..6d2bfbbaf1 --- /dev/null +++ b/scripts/core/ui/components/only-with-children.tsx @@ -0,0 +1,57 @@ +import React from 'react'; + +interface IWrapper { + wrapper: React.ComponentType; +} + +interface IDirectElement { + tagName?: keyof React.ReactHTML; + className?: string; + style?: React.CSSProperties; +} + +function isWrapper(x: IProps): x is IWrapper { + return x['wrapper'] != null; +} + +type IProps = IWrapper | IDirectElement; + +function hasChildren(children) { + if (Array.isArray(children)) { + return children.some((child) => hasChildren(child)); + } else if (children?.type?.name === 'OnlyWithChildren' && children?.props?.children != null) { + return hasChildren(children.props.children); + } else { + return children != null; + } +} + +/** + * Doesn't render the parent when all children are null. + * It only works with static values. + * React components inside children array are treated as non-null, unless it's an instance of OnlyWithChildren. +*/ +export class OnlyWithChildren extends React.PureComponent { + render() { + if (hasChildren(this.props.children) !== true) { + return null; + } + + if (isWrapper(this.props)) { + const Wrapper = this.props.wrapper; + + return ( + {this.props.children} + ); + } else { + return React.createElement( + this.props.tagName ?? 'div', + { + className: this.props.className, + style: this.props.style, + }, + this.props.children, + ); + } + } +} \ No newline at end of file From f8d47d9a9bce03a96e442e64981f9558414288e8 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 22 May 2020 16:14:13 +0200 Subject: [PATCH 0019/1070] move default sort option from generic list to crud manager --- scripts/core/helpers/CrudManager.tsx | 3 ++- scripts/core/superdesk-api.d.ts | 2 +- scripts/core/ui/components/ListPage/generic-list-page.tsx | 5 ++++- .../src/AnnotationInputWithKnowledgeBase.tsx | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/core/helpers/CrudManager.tsx b/scripts/core/helpers/CrudManager.tsx index 7425be22ad..083b60b8c5 100644 --- a/scripts/core/helpers/CrudManager.tsx +++ b/scripts/core/helpers/CrudManager.tsx @@ -212,6 +212,7 @@ export function connectCrudManager name: string, endpoint: string, + defaultSortOption?: ISortOption, formatFiltersForServer?: (filters: ICrudManagerFilters) => ICrudManagerFilters, ): React.ComponentType { const component = class extends React.Component> @@ -226,7 +227,7 @@ export function connectCrudManager> { formConfig: IFormGroup; - defaultSortOption?: ISortOption; additionalSortOptions?: Array<{label: string; field: string;}>; defaultFilters?: Partial; ItemComponent: React.ComponentType>; @@ -1048,6 +1047,7 @@ declare module 'superdesk-api' { WrappedComponent: React.ComponentType, name: string, endpoint: string, + defaultSortOption?: ISortOption, formatFiltersForServer?: (filters: ICrudManagerFilters) => ICrudManagerFilters, ): React.ComponentType; ListItem: React.ComponentType; diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 4a2e55c0ce..ab06e8eb03 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -34,6 +34,7 @@ import { ICrudManager, IFormGroup, IBaseRestApiResponse, + ISortOption, } from 'superdesk-api'; import {gettext} from 'core/utils'; import ng from 'core/services/ng'; @@ -325,7 +326,7 @@ export class GenericListPageComponent componentDidMount() { const filters = this.props.defaultFilters ? this.validateFilters(this.props.defaultFilters) : {}; - this.props.items.read(1, this.props.defaultSortOption, filters); + this.props.items.read(1, this.props.items.activeSortOption, filters); if (this.props.refreshOnEvents != null) { this.props.refreshOnEvents.forEach((eventName) => { @@ -644,11 +645,13 @@ export class GenericListPageComponent export const getGenericListPageComponent = ( resource: string, formConfig: IFormGroup, + defaultSortOption?: ISortOption, ) => { var Component = connectCrudManager, IPropsConnected, T>( GenericListPageComponent, 'items', resource, + defaultSortOption, (filters: IFormGroup) => { const formConfigForFilters = getFormGroupForFiltering(formConfig); const fieldTypesLookup = getFormFieldsFlat(formConfigForFilters) diff --git a/scripts/extensions/annotationsLibrary/src/AnnotationInputWithKnowledgeBase.tsx b/scripts/extensions/annotationsLibrary/src/AnnotationInputWithKnowledgeBase.tsx index 3ed605f026..a486789526 100644 --- a/scripts/extensions/annotationsLibrary/src/AnnotationInputWithKnowledgeBase.tsx +++ b/scripts/extensions/annotationsLibrary/src/AnnotationInputWithKnowledgeBase.tsx @@ -6,6 +6,7 @@ import { ICrudManager, IPropsAnnotationInputComponent, ISuperdesk, + ISortOption, } from 'superdesk-api'; import {getFields} from './GetFields'; @@ -13,6 +14,8 @@ interface IPropsConnected { conceptItems: ICrudManager; } +const defaultSortOption: ISortOption = {field: 'name', direction: 'ascending'}; + export function getAnnotationInputWithKnowledgeBase(superdesk: ISuperdesk) { class AnnotationInputWithKnowledgeBaseComponent extends React.Component { @@ -23,7 +26,7 @@ export function getAnnotationInputWithKnowledgeBase(superdesk: ISuperdesk) { this.props.conceptItems.read( 1, - {field: 'name', direction: 'ascending'}, + defaultSortOption, {name: generateFilterForServer(nameField.type, this.props.annotationText)}, ); } @@ -50,5 +53,6 @@ export function getAnnotationInputWithKnowledgeBase(superdesk: ISuperdesk) { AnnotationInputWithKnowledgeBaseComponent, 'conceptItems', 'concept_items', + defaultSortOption, ); } From 7a4a0d0d4a6be2352b5b97e08ddeb8d8c647a285 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 26 May 2020 11:40:31 +0200 Subject: [PATCH 0020/1070] add header/content sections --- .../ContentProfileConfigNonText.tsx | 167 ++++++++++++------ scripts/core/superdesk-api.d.ts | 6 + 2 files changed, 122 insertions(+), 51 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 136cdbf040..d6ce9281ac 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -19,6 +19,8 @@ import {assertNever} from 'core/helpers/typescript-helpers'; import {GenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; import {SortableContainer, SortableElement} from 'react-sortable-hoc'; import arrayMove from 'array-move'; +import {Button} from 'superdesk-ui-framework'; +import {groupBy} from 'lodash'; interface IProps { profile: IContentProfileNonText; @@ -26,7 +28,8 @@ interface IProps { } interface IState { - fields: IArrayKeyed; + fields: {[key in IContentProfileSection]: IArrayKeyed}; + activeTab: keyof typeof IContentProfileSection; } // subset of FormFieldType @@ -35,11 +38,30 @@ enum IContentProfileFieldTypes { number = 'number', } +enum IContentProfileSection { + header = 'header', + content = 'content', +} + function getAllContentProfileFieldTypes(): Array { return Object.keys(IContentProfileFieldTypes).map((key) => IContentProfileFieldTypes[key]); } -function getImageFormConfig(): IFormGroup { +function getAllContentProfileSections(): Array { + return Object.keys(IContentProfileSection).map((key) => IContentProfileSection[key]); +} + +function getLabelForSection(section: IContentProfileSection) { + if (section === IContentProfileSection.header) { + return gettext('Header'); + } else if (section === IContentProfileSection.content) { + return gettext('Content'); + } else { + return assertNever(section); + } +} + +function getCommonContentProfileConfig(): Array { const idField: IFormField = { label: gettext('ID'), type: FormFieldType.textSingleLine, @@ -54,6 +76,17 @@ function getImageFormConfig(): IFormGroup { required: true, }; + const sectionField: IFormField = { + label: gettext('Section'), + type: FormFieldType.select, + component_parameters: { + items: getAllContentProfileSections() + .map((section) => ({id: section, label: getLabelForSection(section)})), + }, + field: 'section', + required: true, + }; + const sdWidth: IFormField = { label: gettext('Width'), type: FormFieldType.select, @@ -100,6 +133,10 @@ function getImageFormConfig(): IFormGroup { required: false, }; + return [idField, labelField, sectionField, sdWidth, fieldType, requiredField]; +} + +function getImageFormConfig(): IFormGroup { const displayInMediaEditor: IFormField = { label: gettext('Display in media editor'), type: FormFieldType.checkbox, @@ -110,38 +147,17 @@ function getImageFormConfig(): IFormGroup { const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [labelField, idField, sdWidth, fieldType, requiredField, displayInMediaEditor], + form: [...getCommonContentProfileConfig(), displayInMediaEditor], }; return formConfig; } function getVideoFormConfig(): IFormGroup { - const idField: IFormField = { - label: gettext('ID'), - type: FormFieldType.textSingleLine, - field: 'id', - required: true, - }; - - const labelField: IFormField = { - label: gettext('Label'), - type: FormFieldType.textSingleLine, - field: 'label', - required: true, - }; - - const requiredField: IFormField = { - label: gettext('Required'), - type: FormFieldType.checkbox, - field: 'required', - required: false, - }; - const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [labelField, idField, requiredField], + form: [...getCommonContentProfileConfig()], }; return formConfig; @@ -195,6 +211,7 @@ class ItemBase extends React.PureComponent {item.label} +
); } @@ -249,16 +266,23 @@ export class ContentProfileConfigNonText extends React.Component this.lastKey = 0; this.generateKey = () => (++this.lastKey).toString(); + // adding keys to items because they will be reordered and they don't have static IDs to be used as react keys + const fieldsKeyed = (props.profile.fields ?? []).map( + (field) => ({key: this.generateKey(), value: field}), + ); + + var grouped = groupBy(fieldsKeyed, (item) => item.value.section); + this.state = { - fields: (props.profile.fields ?? []).map( - (field) => ({key: this.generateKey(), value: field}), - ), + fields: { + header: grouped[IContentProfileSection.header] ?? [], + content: grouped[IContentProfileSection.content] ?? [], + }, + activeTab: getAllContentProfileSections()[0], }; const onSortEnd = ({oldIndex, newIndex}) => { - this.setState({ - fields: arrayMove(this.state.fields, oldIndex, newIndex), - }); + this.updateCurrentFields((_fields) => arrayMove(_fields, oldIndex, newIndex)); }; class ItemsContainerComponent extends React.PureComponent { @@ -272,14 +296,42 @@ export class ContentProfileConfigNonText extends React.Component } this.ItemsContainerComponent = ItemsContainerComponent; + + this.updateCurrentFields = this.updateCurrentFields.bind(this); + } + + updateCurrentFields( + fn: (items: IArrayKeyed) => IArrayKeyed, + callback?: () => void, + ) { + this.setState( + { + fields: { + ...this.state.fields, + [this.state.activeTab]: fn(this.state.fields[this.state.activeTab]), + }, + }, + () => { + if (callback != null) { + callback(); + } + }, + ); } componentDidUpdate() { - this.props.profile.fields = this.state.fields.map(({value}) => value); + const initialArray: Array = []; + + this.props.profile.fields = getAllContentProfileSections() + .reduce>( + (acc, key) => [...acc, ...this.state.fields[key].map(({value}) => value)], + initialArray, + ); } render() { - const {fields} = this.state; + const {activeTab} = this.state; + const fields = this.state.fields[this.state.activeTab]; const formConfig = getFormConfig(IContentProfileTypeNonText[this.props.profileType]); @@ -293,15 +345,15 @@ export class ContentProfileConfigNonText extends React.Component read: () => Promise.resolve(fieldsResponse), update: (item) => { return new Promise((resolve) => { - this.setState( - { - fields: this.state.fields.map((field) => { + this.updateCurrentFields( + (_fields) => { + return _fields.map((field) => { if (field.key === item._id) { return {...field, value: stripSystemId(item)}; } else { return field; } - }), + }); }, () => { resolve(item); @@ -316,16 +368,14 @@ export class ContentProfileConfigNonText extends React.Component _id: this.generateKey(), }; - this.setState( - { - fields: [ - { - key: this.generateKey(), - value: item, - }, - ...fields, - ], - }, + this.updateCurrentFields( + (_fields) => [ + { + key: this.generateKey(), + value: item, + }, + ..._fields, + ], () => { resolve(itemWithId); }, @@ -334,10 +384,10 @@ export class ContentProfileConfigNonText extends React.Component }, delete: (item) => { return new Promise((resolve) => { - this.setState( - { - fields: this.state.fields.filter(({key}) => key !== item._id), - }, + this.updateCurrentFields( + (_fields) => _fields.filter( + ({key}) => key !== item._id, + ), () => { resolve(); }, @@ -354,6 +404,21 @@ export class ContentProfileConfigNonText extends React.Component return (
+ { + getAllContentProfileSections().map((section) => { + return ( +
diff --git a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx index 6a284570a0..5613007a45 100644 --- a/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx +++ b/scripts/extensions/annotationsLibrary/src/annotations-library-page.tsx @@ -86,7 +86,7 @@ export function getAnnotationsLibraryPage(superdesk: ISuperdesk) { return ( formConfig} ItemComponent={ItemComponent} getNewItemTemplate={(page) => { const baseTemplate: Partial = { From bd063301c37f8b0bb717ce4ae98284c130659aea Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 26 May 2020 16:17:14 +0200 Subject: [PATCH 0023/1070] improve types --- scripts/core/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/core/utils.ts b/scripts/core/utils.ts index e16ad294f4..b8d30309a1 100644 --- a/scripts/core/utils.ts +++ b/scripts/core/utils.ts @@ -42,7 +42,7 @@ export const getSuperdeskType = (event, supportExternalFiles = true) => export const gettext = ( text: string, params: {[key: string]: string | number} = {}, -) => { +): string => { if (!text) { return ''; } @@ -75,7 +75,7 @@ export const gettextPlural = ( text: string, pluralText: string, params: {[key: string]: string | number} = {}, -) => { +): string => { if (!text) { return ''; } From 3c1acc72dbcac991b0bd12b47ffb19e84ee6ad46 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 26 May 2020 16:45:37 +0200 Subject: [PATCH 0024/1070] display extra settings by field type --- .../ContentProfileConfigNonText.tsx | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 4d0ee0e34d..189f3cdcec 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -61,7 +61,9 @@ function getLabelForSection(section: IContentProfileSection) { } } -function getCommonContentProfileConfig(): Array { +function getCommonContentProfileConfig( + field: Partial | undefined, +): Array { const idField: IFormField = { label: gettext('ID'), type: FormFieldType.textSingleLine, @@ -133,10 +135,26 @@ function getCommonContentProfileConfig(): Array { required: false, }; - return [idField, labelField, sectionField, sdWidth, fieldType, requiredField]; + const fieldTypeGroup: IFormGroup = { + type: 'inline', + direction: 'vertical', + form: [ + fieldType, + ...(field?.type == null ? [] : getAttributesForFormFieldType(IContentProfileFieldTypes[field.type])), + ], + }; + + return [ + idField, + labelField, + sectionField, + sdWidth, + fieldTypeGroup, + requiredField, + ]; } -function getImageFormConfig(): IFormGroup { +function getImageFormConfig(field: Partial | undefined): IFormGroup { const displayInMediaEditor: IFormField = { label: gettext('Display in media editor'), type: FormFieldType.checkbox, @@ -147,28 +165,31 @@ function getImageFormConfig(): IFormGroup { const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [...getCommonContentProfileConfig(), displayInMediaEditor], + form: [...getCommonContentProfileConfig(field), displayInMediaEditor], }; return formConfig; } -function getVideoFormConfig(): IFormGroup { +function getVideoFormConfig(field: Partial): IFormGroup { const formConfig: IFormGroup = { direction: 'vertical', type: 'inline', - form: [...getCommonContentProfileConfig()], + form: [...getCommonContentProfileConfig(field)], }; return formConfig; } -function getFormConfig(type: IContentProfileTypeNonText): IFormGroup { +function getFormConfig( + type: IContentProfileTypeNonText, + field: Partial | undefined, +): IFormGroup { switch (type) { case IContentProfileTypeNonText.image: - return getImageFormConfig(); + return getImageFormConfig(field); case IContentProfileTypeNonText.video: - return getVideoFormConfig(); + return getVideoFormConfig(field); default: return assertNever(type); } @@ -192,7 +213,7 @@ function getAttributesForTextSingleLine(): Array { return [minLengthField, maxLengthField]; } -export function getAttributesForFormFieldType(type: IContentProfileFieldTypes): Array { +function getAttributesForFormFieldType(type: IContentProfileFieldTypes): Array { switch (type) { case IContentProfileFieldTypes.textSingleLine: return getAttributesForTextSingleLine(); @@ -333,8 +354,6 @@ export class ContentProfileConfigNonText extends React.Component const {activeTab} = this.state; const fields = this.state.fields[this.state.activeTab]; - const formConfig = getFormConfig(IContentProfileTypeNonText[this.props.profileType]); - const fieldsResponse: ICrudManagerResponse = { _items: fields.map(({key, value}) => ({...value, _id: key})), _meta: {total: fields.length, page: 1, max_results: fields.length}, @@ -420,7 +439,7 @@ export class ContentProfileConfigNonText extends React.Component } formConfig} + getFormConfig={(item) => getFormConfig(IContentProfileTypeNonText[this.props.profileType], item)} ItemComponent={ItemComponent} ItemsContainerComponent={this.ItemsContainerComponent} items={crudManagerForContentProfileFields} From 274bfa90257f9fa92c1c8758e2f3fd7af218cd6f Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 26 May 2020 17:07:44 +0200 Subject: [PATCH 0025/1070] improve types --- .../generic-list-page-item-view-edit.tsx | 37 +++++++++---------- .../ui/components/generic-form/from-group.tsx | 10 ++--- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index 96674f4c37..ae94ff179e 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -9,42 +9,44 @@ import { SidePanelContent, SidePanelContentBlock, } from 'core/components/SidePanel'; -import {connectServices} from 'core/helpers/ReactRenderAsync'; import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; import {IFormGroup} from 'superdesk-api'; import {isHttpApiError} from 'core/helpers/network'; import {gettext} from 'core/utils'; +import ng from 'core/services/ng'; -interface IProps { +interface IProps { operation: 'editing' | 'creation'; editMode: boolean; formConfig: IFormGroup; - item: {[key: string]: any}; + item: Partial; onEditModeChange(nextValue: boolean): void; onClose: () => void; onCancel?: () => void; onSave: (nextItem) => Promise; - - // connected services - modal?: any; } -interface IState { - nextItem: IProps['item']; +interface IState { + nextItem: IProps['item']; issues: {[field: string]: Array}; } -const getInitialState = (props: IProps) => ({ - nextItem: props.item, - issues: {}, -}); +function getInitialState(props: IProps) { + return { + nextItem: props.item, + issues: {}, + }; +} -class GenericListPageItemViewEditComponent extends React.Component { +export class GenericListPageItemViewEdit extends React.Component, IState> { _mounted: boolean; + modal: any; constructor(props) { super(props); + this.modal = ng.get('modal'); + this.state = getInitialState(props); this.enableEditMode = this.enableEditMode.bind(this); @@ -66,7 +68,7 @@ class GenericListPageItemViewEditComponent extends React.Component) { + handleFieldChange(field: string, nextValue: valueof['item']>) { // using updater function to avoid race conditions this.setState((prevState) => ({ ...prevState, @@ -88,7 +90,7 @@ class GenericListPageItemViewEditComponent extends React.Component { // do nothing @@ -206,8 +208,3 @@ class GenericListPageItemViewEditComponent extends React.Component( - GenericListPageItemViewEditComponent, - ['modal'], -); diff --git a/scripts/core/ui/components/generic-form/from-group.tsx b/scripts/core/ui/components/generic-form/from-group.tsx index ca2dd8c7a4..46bee5a1df 100644 --- a/scripts/core/ui/components/generic-form/from-group.tsx +++ b/scripts/core/ui/components/generic-form/from-group.tsx @@ -6,16 +6,16 @@ import {assertNever} from 'core/helpers/typescript-helpers'; import {FormGroupWrapper} from './form-group-wrapper'; import {IFormGroup} from 'superdesk-api'; -interface IProps { +interface IProps { formConfig: IFormGroup; - item: {[key: string]: any}; + item: Partial; editMode: boolean; issues: {[field: string]: Array}; - handleFieldChange(field: keyof IProps['item'], nextValue: valueof): void; + handleFieldChange(field: string, nextValue: valueof['item']>): void; } // The component is recursive! -export class FormViewEdit extends React.Component { +export class FormViewEdit extends React.Component> { render() { const group: IFormGroup = this.props.formConfig; @@ -47,7 +47,7 @@ export class FormViewEdit extends React.Component { issues={this.props.issues[item.field] || []} previewOutput={false} onChange={ - (nextValue, fieldName?: string) => + (nextValue, fieldName?) => this.props.handleFieldChange( item.field != null ? item.field : fieldName, nextValue, From dddd9d9b845e4ad673ba4ba738bea6ebc69c891e Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 May 2020 11:39:54 +0200 Subject: [PATCH 0026/1070] where possible, pass getFormConfig as an argument so it can be called on each render of child components and display the correct fields based on the data of the item being edited --- .../generic-list-page-item-view-edit.tsx | 4 +- .../components/ListPage/generic-list-page.tsx | 94 +++++++++---------- 2 files changed, 46 insertions(+), 52 deletions(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index ae94ff179e..3e275d698a 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -18,7 +18,7 @@ import ng from 'core/services/ng'; interface IProps { operation: 'editing' | 'creation'; editMode: boolean; - formConfig: IFormGroup; + getFormConfig(item?: Partial): IFormGroup; item: Partial; onEditModeChange(nextValue: boolean): void; onClose: () => void; @@ -197,7 +197,7 @@ export class GenericListPageItemViewEdit extends React.Component, I const {getFormConfig, ItemComponent} = this.props; const ItemsContainerComponent = this.props.ItemsContainerComponent ?? DefaultItemsContainerComponent; - const formConfigForFilters = getFormGroupForFiltering(getFormConfig(this.state.filterValues)); + const formConfigForFilters = getFormGroupForFiltering(this.props.getFormConfig()); const fieldsList = getFormFieldsRecursive(getFormConfig().form); const sortOptions: Array = [ @@ -488,7 +488,9 @@ export class GenericListPageComponent }}> key="new-item" operation="creation" item={this.state.newItem} - formConfig={getFormConfig(this.state.newItem)} + getFormConfig={getFormConfig} editMode={true} onEditModeChange={() => { this.setState((prevState) => ({ @@ -592,53 +594,45 @@ export class GenericListPageComponent onCancel={this.closeNewItemForm} /> - ) : this.state.editItemId != null ? (() => { - const item = items._items.find(({_id}) => _id === this.state.editItemId); - - return ( - - { - this.setState((prevState) => ({ - ...prevState, - editItemId: null, - })); - }} - item={item} - formConfig={getFormConfig(item)} - onSave={(nextItem) => items.update(nextItem).then(() => { - this.notify.success(gettext('The item has been updated.')); - })} - onClose={this.closePreview} - /> - - ); - })() : this.state.previewItemId != null ? (() => { - const item = items._items.find(({_id}) => _id === this.state.previewItemId); - - return ( - - { - this.setState((prevState) => ({ - ...prevState, - editItemId: prevState.previewItemId, - })); - }} - item={item} - formConfig={getFormConfig(item)} - onSave={(nextItem) => items.update(nextItem)} - onClose={this.closePreview} - /> - - ); - })() : null + ) : this.state.editItemId != null ? ( + + { + this.setState((prevState) => ({ + ...prevState, + editItemId: null, + })); + }} + item={items._items.find(({_id}) => _id === this.state.editItemId)} + getFormConfig={getFormConfig} + onSave={(nextItem) => items.update(nextItem).then(() => { + this.notify.success(gettext('The item has been updated.')); + })} + onClose={this.closePreview} + /> + + ) : this.state.previewItemId != null ? ( + + { + this.setState((prevState) => ({ + ...prevState, + editItemId: prevState.previewItemId, + })); + }} + item={items._items.find(({_id}) => _id === this.state.previewItemId)} + getFormConfig={getFormConfig} + onSave={(nextItem) => items.update(nextItem)} + onClose={this.closePreview} + /> + + ) : null }
From 025268bafce3032d847d8bb7da3b0f83c1e53e6c Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 May 2020 11:40:09 +0200 Subject: [PATCH 0027/1070] add a separate group for field options --- .../components/ContentProfileConfigNonText.tsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 189f3cdcec..2785bcb28c 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -10,6 +10,7 @@ import { ICrudManagerResponse, IItemWithId, IPropsGenericFormItemComponent, + IFormGroupCollapsible, } from 'superdesk-api'; import {gettext} from 'core/utils'; @@ -140,10 +141,25 @@ function getCommonContentProfileConfig( direction: 'vertical', form: [ fieldType, - ...(field?.type == null ? [] : getAttributesForFormFieldType(IContentProfileFieldTypes[field.type])), ], }; + const fieldOptionsGroupType: IFormGroupCollapsible = {label: gettext('Field options'), openByDefault: true}; + + const fieldOptions = field?.type == null + ? [] + : getAttributesForFormFieldType(IContentProfileFieldTypes[field.type]); + + if (fieldOptions.length > 0) { + const optionsGroup: IFormGroup = { + type: fieldOptionsGroupType, + direction: 'vertical', + form: fieldOptions, + }; + + fieldTypeGroup.form.push(optionsGroup); + } + return [ idField, labelField, From 566315d80a4e14af1e56791f0be807a53f2a337d Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 May 2020 12:33:37 +0200 Subject: [PATCH 0028/1070] don't send values for fields which aren't in form config at the time of saving --- .../generic-list-page-item-view-edit.tsx | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index 3e275d698a..15b7e12444 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -14,6 +14,7 @@ import {IFormGroup} from 'superdesk-api'; import {isHttpApiError} from 'core/helpers/network'; import {gettext} from 'core/utils'; import ng from 'core/services/ng'; +import {getFormFieldsFlat} from '../generic-form/get-form-fields-flat'; interface IProps { operation: 'editing' | 'creation'; @@ -100,7 +101,28 @@ export class GenericListPageItemViewEdit extends React.Component, I return JSON.stringify(this.props.item) !== JSON.stringify(this.state.nextItem); } handleSave() { - this.props.onSave(this.state.nextItem).then(() => { + const formConfig = this.props.getFormConfig(this.state.nextItem); + const currentFieldsIds = getFormFieldsFlat(formConfig).map(({field}) => field).concat('_id'); + + /* + Form config is dynamic and can change during editing. + For example users can select a dropdown value + which would cause more fields specific to that option to appear or others to disappear. + + There might be data in the state for fields which no longer exist in form config. + Only fields in form config at the time of saving will be sent. + */ + const nextItemCleaned: Partial = currentFieldsIds.reduce>((acc, field) => { + const value = this.state.nextItem[field]; + + if (value != null) { + acc[field] = value; + } + + return acc; + }, {}); + + this.props.onSave(nextItemCleaned).then(() => { if (this._mounted) { this.setState({ issues: {}, From 699c135657995c0f45c2d4b9ac73124bb0455c0c Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 May 2020 13:05:20 +0200 Subject: [PATCH 0029/1070] validate for required fields before saving --- .../generic-list-page-item-view-edit.tsx | 30 +++++++++++++++++-- .../ui/components/generic-form/has-value.tsx | 26 ++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 scripts/core/ui/components/generic-form/has-value.tsx diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index 15b7e12444..22ad003435 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -15,6 +15,7 @@ import {isHttpApiError} from 'core/helpers/network'; import {gettext} from 'core/utils'; import ng from 'core/services/ng'; import {getFormFieldsFlat} from '../generic-form/get-form-fields-flat'; +import {hasValue} from '../generic-form/has-value'; interface IProps { operation: 'editing' | 'creation'; @@ -27,9 +28,13 @@ interface IProps { onSave: (nextItem) => Promise; } +interface IIssues { + [field: string]: Array; +} + interface IState { nextItem: IProps['item']; - issues: {[field: string]: Array}; + issues: IIssues; } function getInitialState(props: IProps) { @@ -102,7 +107,8 @@ export class GenericListPageItemViewEdit extends React.Component, I } handleSave() { const formConfig = this.props.getFormConfig(this.state.nextItem); - const currentFieldsIds = getFormFieldsFlat(formConfig).map(({field}) => field).concat('_id'); + const currentFields = getFormFieldsFlat(formConfig); + const currentFieldsIds = currentFields.map(({field}) => field).concat('_id'); /* Form config is dynamic and can change during editing. @@ -122,6 +128,24 @@ export class GenericListPageItemViewEdit extends React.Component, I return acc; }, {}); + const issues = currentFields + .filter( + (fieldConfig) => hasValue(fieldConfig, nextItemCleaned[fieldConfig.field]) !== true, + ) + .reduce((acc, fieldConfig) => { + acc[fieldConfig.field] = [gettext('Field is required')]; + + return acc; + }, {}); + + if (Object.keys(issues).length > 0) { + this.setState({ + issues, + }); + + return; + } + this.props.onSave(nextItemCleaned).then(() => { if (this._mounted) { this.setState({ @@ -133,7 +157,7 @@ export class GenericListPageItemViewEdit extends React.Component, I }) .catch((res) => { if (isHttpApiError(res)) { - let issues = {}; + let issues: IIssues = {}; for (let fieldName in res._issues) { let issuesForField = []; diff --git a/scripts/core/ui/components/generic-form/has-value.tsx b/scripts/core/ui/components/generic-form/has-value.tsx new file mode 100644 index 0000000000..43436ea157 --- /dev/null +++ b/scripts/core/ui/components/generic-form/has-value.tsx @@ -0,0 +1,26 @@ +import {FormFieldType} from './interfaces/form'; +import {IFormField} from 'superdesk-api'; +import {assertNever} from 'core/helpers/typescript-helpers'; + +export function hasValue(fieldConfig: IFormField, value: any): boolean { + const type: FormFieldType = fieldConfig.type; + + switch (type) { + case FormFieldType.textSingleLine: + case FormFieldType.textEditor3: + return typeof value === 'string' && value.trim().length > 0; + case FormFieldType.vocabularySingleValue: + case FormFieldType.contentFilterSingleValue: + case FormFieldType.deskSingleValue: + case FormFieldType.stageSingleValue: + case FormFieldType.macroSingleValue: + case FormFieldType.yesNo: + case FormFieldType.select: + case FormFieldType.selectMultiple: + case FormFieldType.number: + case FormFieldType.checkbox: + return typeof value !== 'undefined'; + default: + assertNever(type); + } +} From d5446dd945e15fc43f8a171ba0621b0baccfd534 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 May 2020 13:59:43 +0200 Subject: [PATCH 0030/1070] add required indicator --- .../content/components/ContentProfileConfigNonText.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 2785bcb28c..cbd46eb313 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -249,6 +249,9 @@ class ItemBase extends React.PureComponent page.startEditing(item._id)}>{gettext('Edit')} + { + item.required === true ? ({gettext('required')}) : null + }
); } From fb1f7b057b74337aeaf907b638677f09d1c11c67 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 28 May 2020 11:03:46 +0200 Subject: [PATCH 0031/1070] only pass relevant methods as a `page` instead of the entire class --- scripts/core/superdesk-api.d.ts | 10 +++++++--- .../components/ListPage/generic-list-page.tsx | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 4c6958549b..557a22065a 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -678,6 +678,10 @@ declare module 'superdesk-api' { // GENERIC FORM + export interface IPropsGenericFormContainer { + page: IGenericListPageComponent; + } + export interface IPropsGenericFormItemComponent { item: T; page: IGenericListPageComponent; @@ -689,7 +693,7 @@ declare module 'superdesk-api' { additionalSortOptions?: Array<{label: string; field: string;}>; defaultFilters?: Partial; ItemComponent: React.ComponentType>; - ItemsContainerComponent?: React.ComponentType; + ItemsContainerComponent?: React.ComponentType>; // Allows initializing a new item with some fields already filled. getNewItemTemplate?(page: IGenericListPageComponent): Partial; @@ -855,7 +859,7 @@ declare module 'superdesk-api' { onClose?(): void; } - export interface IGenericListPageComponent> { + export interface IGenericListPageComponent { openPreview(id: string): void; startEditing(id: string): void; closePreview(): void; @@ -864,7 +868,7 @@ declare module 'superdesk-api' { openNewItemForm(): void; closeNewItemForm(): void; deleteItem(item: T): void; - getActiveFilters(): Partial; + getActiveFilters(): Partial; removeFilter(fieldName: string): void; } diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 3562233c74..c156d7750d 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -110,6 +110,7 @@ export class GenericListPageComponent }; this.openPreview = this.openPreview.bind(this); + this.startEditing = this.startEditing.bind(this); this.closePreview = this.closePreview.bind(this); this.setFiltersVisibility = this.setFiltersVisibility.bind(this); this.handleFilterFieldChange = this.handleFilterFieldChange.bind(this); @@ -118,6 +119,7 @@ export class GenericListPageComponent this.deleteItem = this.deleteItem.bind(this); this.getActiveFilters = this.getActiveFilters.bind(this); this.removeFilter = this.removeFilter.bind(this); + this.refetchDataUsingCurrentFilters = this.refetchDataUsingCurrentFilters.bind(this); this.filter = this.filter.bind(this); @@ -366,6 +368,19 @@ export class GenericListPageComponent ...(this.props.additionalSortOptions ?? []), ]; + var page: IGenericListPageComponent = { + openPreview: this.openPreview, + startEditing: this.startEditing, + closePreview: this.closePreview, + setFiltersVisibility: this.setFiltersVisibility, + handleFilterFieldChange: this.handleFilterFieldChange, + openNewItemForm: this.openNewItemForm, + closeNewItemForm: this.closeNewItemForm, + deleteItem: this.deleteItem, + getActiveFilters: this.getActiveFilters, + removeFilter: this.removeFilter, + }; + const getContents = () => { if (items._items.length === 0) { if (Object.keys(activeFilters).length > 0) { @@ -387,10 +402,10 @@ export class GenericListPageComponent } } else { return ( - + { items._items.map( - (item, i) => , + (item, i) => , ) } From 1eec728c15d5f7c7c1666c9e3c357462fa661928 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 28 May 2020 11:31:47 +0200 Subject: [PATCH 0032/1070] add a comment --- scripts/core/superdesk-api.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 557a22065a..1539e6884d 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -577,6 +577,8 @@ declare module 'superdesk-api' { type: keyof typeof IContentProfileFieldTypes; section: keyof typeof IContentProfileSection; required: boolean; + + // it will also contain more fields specific to field type } export enum IContentProfileTypeNonText { From 5a5958394fcb9ddb771912d575be0a861df70d47 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 28 May 2020 11:48:44 +0200 Subject: [PATCH 0033/1070] fix types --- .../content/components/ContentProfileConfigNonText.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index cbd46eb313..94ea823487 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -11,6 +11,7 @@ import { IItemWithId, IPropsGenericFormItemComponent, IFormGroupCollapsible, + IPropsGenericFormContainer, } from 'superdesk-api'; import {gettext} from 'core/utils'; @@ -298,7 +299,7 @@ function stripSystemId(item: IContentProfileFieldWithSystemId): IContentProfileF export class ContentProfileConfigNonText extends React.Component { private generateKey: () => string; private lastKey: number; - private ItemsContainerComponent: React.ComponentType; + private ItemsContainerComponent: React.ComponentType>; constructor(props: IProps) { super(props); @@ -325,7 +326,8 @@ export class ContentProfileConfigNonText extends React.Component this.updateCurrentFields((_fields) => arrayMove(_fields, oldIndex, newIndex)); }; - class ItemsContainerComponent extends React.PureComponent { + class ItemsContainerComponent + extends React.PureComponent> { render() { return ( From e0af4d320d3a35a4610fa780917b4fe30b76e19f Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 29 May 2020 08:37:38 +0200 Subject: [PATCH 0034/1070] rename to plain text --- .../InternalDestinations.tsx | 2 +- .../components/ContentProfileConfigNonText.tsx | 16 ++++++++-------- scripts/core/superdesk-api.d.ts | 4 ++-- .../ui/components/generic-form/form-field.tsx | 6 +++--- .../generic-form/generate-filter-for-server.tsx | 2 +- .../get-form-group-for-filtering.tsx | 6 +++--- .../generic-form/get-initial-values.tsx | 2 +- .../ui/components/generic-form/has-value.tsx | 2 +- .../{text-single-line.tsx => plain-text.tsx} | 2 +- .../components/generic-form/interfaces/form.ts | 2 +- .../generic-form/tests/generic-form.spec.tsx | 2 +- .../annotationsLibrary/src/GetFields.ts | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) rename scripts/core/ui/components/generic-form/input-types/{text-single-line.tsx => plain-text.tsx} (95%) diff --git a/scripts/apps/internal-destinations/InternalDestinations.tsx b/scripts/apps/internal-destinations/InternalDestinations.tsx index 5e29cee86e..6f85006ffa 100644 --- a/scripts/apps/internal-destinations/InternalDestinations.tsx +++ b/scripts/apps/internal-destinations/InternalDestinations.tsx @@ -12,7 +12,7 @@ import {gettext} from 'core/utils'; function getNameField(): IFormField { return { label: gettext('Destination name'), - type: FormFieldType.textSingleLine, + type: FormFieldType.plainText, field: 'name', required: true, }; diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 94ea823487..2fea01b06a 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -36,7 +36,7 @@ interface IState { // subset of FormFieldType enum IContentProfileFieldTypes { - textSingleLine = 'textSingleLine', + plainText = 'plainText', number = 'number', } @@ -68,14 +68,14 @@ function getCommonContentProfileConfig( ): Array { const idField: IFormField = { label: gettext('ID'), - type: FormFieldType.textSingleLine, + type: FormFieldType.plainText, field: 'id', required: true, }; const labelField: IFormField = { label: gettext('Label'), - type: FormFieldType.textSingleLine, + type: FormFieldType.plainText, field: 'label', required: true, }; @@ -111,9 +111,9 @@ function getCommonContentProfileConfig( component_parameters: { items: getAllContentProfileFieldTypes().map((type) => { switch (type) { - case IContentProfileFieldTypes.textSingleLine: + case IContentProfileFieldTypes.plainText: return { - id: IContentProfileFieldTypes.textSingleLine, + id: IContentProfileFieldTypes.plainText, label: gettext('Plain text (single line)'), }; case IContentProfileFieldTypes.number: @@ -212,7 +212,7 @@ function getFormConfig( } } -function getAttributesForTextSingleLine(): Array { +function getAttributesForPlainText(): Array { const minLengthField: IFormField = { label: gettext('Minimum length'), type: FormFieldType.number, @@ -232,8 +232,8 @@ function getAttributesForTextSingleLine(): Array { function getAttributesForFormFieldType(type: IContentProfileFieldTypes): Array { switch (type) { - case IContentProfileFieldTypes.textSingleLine: - return getAttributesForTextSingleLine(); + case IContentProfileFieldTypes.plainText: + return getAttributesForPlainText(); case IContentProfileFieldTypes.number: return []; default: diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 1539e6884d..dac1b6180b 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -562,7 +562,7 @@ declare module 'superdesk-api' { // subset of FormFieldType export enum IContentProfileFieldTypes { - textSingleLine = 'textSingleLine', + plainText = 'plainText', number = 'number', } @@ -708,7 +708,7 @@ declare module 'superdesk-api' { } export enum FormFieldType { - textSingleLine = 'textSingleLine', + plainText = 'plainText', textEditor3 = 'textEditor3', number = 'number', vocabularySingleValue = 'vocabularySingleValue', diff --git a/scripts/core/ui/components/generic-form/form-field.tsx b/scripts/core/ui/components/generic-form/form-field.tsx index f5035ed1af..68eb9d25ff 100644 --- a/scripts/core/ui/components/generic-form/form-field.tsx +++ b/scripts/core/ui/components/generic-form/form-field.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {TextSingleLine} from './input-types/text-single-line'; +import {PlainText} from './input-types/plain-text'; import {assertNever} from 'core/helpers/typescript-helpers'; import {isIFormGroup, isIFormField, FormFieldType} from './interfaces/form'; import {VocabularySingleValue} from './input-types/vocabulary_single_value'; @@ -19,8 +19,8 @@ import {NumberComponent} from './input-types/number'; export function getFormFieldComponent(type: FormFieldType): React.ComponentType> { switch (type) { - case FormFieldType.textSingleLine: - return TextSingleLine; + case FormFieldType.plainText: + return PlainText; case FormFieldType.textEditor3: return TextEditor3; case FormFieldType.number: diff --git a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx index 5f4f5500c6..88191d6939 100644 --- a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx +++ b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx @@ -3,7 +3,7 @@ import {FormFieldType} from './interfaces/form'; export function generateFilterForServer(type: FormFieldType, value: any): any { switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: return { $regex: value, $options: 'i', diff --git a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx index 85ef8cf2e0..8d712c2b13 100644 --- a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx +++ b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx @@ -5,11 +5,11 @@ import {IFormField, IFormGroup} from 'superdesk-api'; // different components must be used for filtering than for entering/updating items function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { switch (type) { - case FormFieldType.textSingleLine: - return FormFieldType.textSingleLine; + case FormFieldType.plainText: + return FormFieldType.plainText; case FormFieldType.textEditor3: // even though textEditor3 outputs HTML, plaintext has to be used for filtering - return FormFieldType.textSingleLine; + return FormFieldType.plainText; case FormFieldType.number: return FormFieldType.number; case FormFieldType.vocabularySingleValue: diff --git a/scripts/core/ui/components/generic-form/get-initial-values.tsx b/scripts/core/ui/components/generic-form/get-initial-values.tsx index 2c53d7b77a..8d695cdaec 100644 --- a/scripts/core/ui/components/generic-form/get-initial-values.tsx +++ b/scripts/core/ui/components/generic-form/get-initial-values.tsx @@ -8,7 +8,7 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: const type: FormFieldType = fieldConfig.type; switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: case FormFieldType.textEditor3: return {[field]: ''}; case FormFieldType.vocabularySingleValue: diff --git a/scripts/core/ui/components/generic-form/has-value.tsx b/scripts/core/ui/components/generic-form/has-value.tsx index 43436ea157..126da9ad2b 100644 --- a/scripts/core/ui/components/generic-form/has-value.tsx +++ b/scripts/core/ui/components/generic-form/has-value.tsx @@ -6,7 +6,7 @@ export function hasValue(fieldConfig: IFormField, value: any): boolean { const type: FormFieldType = fieldConfig.type; switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: case FormFieldType.textEditor3: return typeof value === 'string' && value.trim().length > 0; case FormFieldType.vocabularySingleValue: diff --git a/scripts/core/ui/components/generic-form/input-types/text-single-line.tsx b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx similarity index 95% rename from scripts/core/ui/components/generic-form/input-types/text-single-line.tsx rename to scripts/core/ui/components/generic-form/input-types/plain-text.tsx index 53d7542e8b..68e08e920d 100644 --- a/scripts/core/ui/components/generic-form/input-types/text-single-line.tsx +++ b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx @@ -2,7 +2,7 @@ import React from 'react'; import classNames from 'classnames'; import {IInputType} from '../interfaces/input-types'; -export class TextSingleLine extends React.Component> { +export class PlainText extends React.Component> { render() { if (this.props.previewOutput) { return
{this.props.value}
; diff --git a/scripts/core/ui/components/generic-form/interfaces/form.ts b/scripts/core/ui/components/generic-form/interfaces/form.ts index 9a4435f024..643c2bbd4e 100644 --- a/scripts/core/ui/components/generic-form/interfaces/form.ts +++ b/scripts/core/ui/components/generic-form/interfaces/form.ts @@ -1,7 +1,7 @@ import {IFormGroup, IFormField, IFormGroupCollapsible} from 'superdesk-api'; export enum FormFieldType { - textSingleLine = 'textSingleLine', + plainText = 'plainText', textEditor3 = 'textEditor3', number = 'number', vocabularySingleValue = 'vocabularySingleValue', diff --git a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx index e6ae601d29..cdff4023f1 100644 --- a/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx +++ b/scripts/core/ui/components/generic-form/tests/generic-form.spec.tsx @@ -13,7 +13,7 @@ function getAllInputTypes(): Array { function getTestFieldConfig(type: FormFieldType): IFormField { switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: case FormFieldType.textEditor3: case FormFieldType.number: case FormFieldType.checkbox: diff --git a/scripts/extensions/annotationsLibrary/src/GetFields.ts b/scripts/extensions/annotationsLibrary/src/GetFields.ts index 8b0df82ddb..9d9db2f1b8 100644 --- a/scripts/extensions/annotationsLibrary/src/GetFields.ts +++ b/scripts/extensions/annotationsLibrary/src/GetFields.ts @@ -6,7 +6,7 @@ export function getFields(superdesk: ISuperdesk) { const nameField: IFormField = { label: gettext('Name'), - type: FormFieldType.textSingleLine, + type: FormFieldType.plainText, field: 'name', required: true, }; From 36788d7d4abba668b496b5933f26f962701d1ec4 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 29 May 2020 09:22:32 +0200 Subject: [PATCH 0035/1070] add multi-line option for plain text field --- .../ContentProfileConfigNonText.tsx | 11 +++++-- .../generic-form/input-types/plain-text.tsx | 32 ++++++++++++++----- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx index 2fea01b06a..a2d476b8f4 100644 --- a/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileConfigNonText.tsx @@ -114,7 +114,7 @@ function getCommonContentProfileConfig( case IContentProfileFieldTypes.plainText: return { id: IContentProfileFieldTypes.plainText, - label: gettext('Plain text (single line)'), + label: gettext('Plain text'), }; case IContentProfileFieldTypes.number: return { @@ -227,7 +227,14 @@ function getAttributesForPlainText(): Array { required: false, }; - return [minLengthField, maxLengthField]; + const multilineField: IFormField = { + label: gettext('Multi-line'), + type: FormFieldType.checkbox, + field: 'multiline', + required: false, + }; + + return [minLengthField, maxLengthField, multilineField]; } function getAttributesForFormFieldType(type: IContentProfileFieldTypes): Array { diff --git a/scripts/core/ui/components/generic-form/input-types/plain-text.tsx b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx index 68e08e920d..f721661041 100644 --- a/scripts/core/ui/components/generic-form/input-types/plain-text.tsx +++ b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx @@ -11,6 +11,29 @@ export class PlainText extends React.Component> { // default value is required so React doesn't complain that uncontrolled component is changed to controlled. const valueWithDefaultValue = this.props.value || ''; + const fieldElement = this.props.formField?.component_parameters?.multiline === true + ? ( +
-
- -
-
- +
+
+ +
+
+ +
-
+
Date: Tue, 30 Mar 2021 13:46:55 +0200 Subject: [PATCH 0073/1070] fix(inputs): Fixed boxed input fields --- .../components/ContentProfileFieldsConfig.tsx | 1 - .../get-content-profiles-form-config.tsx | 8 ++++++- .../content/views/profile-settings.html | 22 ++++++++++--------- .../generic-form/input-types/checkbox.tsx | 6 ++--- .../generic-form/input-types/number.tsx | 1 + .../input-types/select_multiple_values.tsx | 1 + .../select_single_value_static.tsx | 2 ++ 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx b/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx index 6913422e82..e395d1732f 100644 --- a/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx +++ b/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx @@ -125,7 +125,6 @@ class ItemBase extends React.PureComponent<{wrapper: IPropsItem}> { }))} >
+ ); + } +} diff --git a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts index 3c87bfaac3..f869d2041f 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts @@ -1,13 +1,14 @@ import _ from 'lodash'; import * as helpers from 'apps/authoring/authoring/helpers'; import {gettext} from 'core/utils'; -import {appConfig} from 'appConfig'; +import {appConfig, authoringReactViewEnabled} from 'appConfig'; import {canPrintPreview} from 'apps/search/helpers'; AuthoringEmbeddedDirective.$inject = ['api', 'notify', '$filter']; export function AuthoringEmbeddedDirective(api, notify, $filter) { return { - templateUrl: 'scripts/apps/authoring/views/authoring.html', + template: authoringReactViewEnabled ? '
' : undefined, + templateUrl: authoringReactViewEnabled ? undefined : 'scripts/apps/authoring/views/authoring.html', scope: { item: '=', action: '=', diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index ca6d2d8921..43df80fa30 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -32,6 +32,7 @@ import {AuthoringTopbar2React} from './authoring-topbar2-react'; import {appConfig} from 'appConfig'; import {FullPreview} from '../preview/fullPreview'; import {sdApi} from 'api'; +import {AuthoringReact} from 'apps/authoring-react/authoring-react'; export interface IOnChangeParams { item: IArticle; @@ -101,6 +102,7 @@ angular.module('superdesk.apps.authoring', [ .directive('sdDashboardCard', directive.DashboardCard) .directive('sdSendItem', directive.SendItem) .component('sdCharacterCount', reactToAngular1(CharacterCount, ['item', 'html', 'limit'], [], 'display: inline')) + .component('sdAuthoringReact', reactToAngular1(AuthoringReact, ['itemId'], [])) .component('sdCharacterCountConfigButton', reactToAngular1( CharacterCountConfigButton, ['field'], [], 'display: inline', )) diff --git a/styles/sass/app.scss b/styles/sass/app.scss index ec9b6f042a..8ac5be71ab 100644 --- a/styles/sass/app.scss +++ b/styles/sass/app.scss @@ -65,5 +65,6 @@ // Application components @import 'saved-searches'; @import '../../scripts/apps/dashboard/widget-heading.scss'; +@import '../../scripts/apps/authoring-react/authoring-react.scss'; @import '../../scripts/apps/authoring/authoring/services/quick-publish-modal.scss' From 2ddff0f8acdc86d17b3f972bdc5f6bc9e578ac80 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 21 Oct 2021 16:54:26 +0200 Subject: [PATCH 0081/1070] improve authoring service (no logic changed) --- .../authoring/services/AuthoringService.ts | 72 ++++++++++++++----- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/scripts/apps/authoring/authoring/services/AuthoringService.ts b/scripts/apps/authoring/authoring/services/AuthoringService.ts index 39a2622fa0..3f3dccbf1a 100644 --- a/scripts/apps/authoring/authoring/services/AuthoringService.ts +++ b/scripts/apps/authoring/authoring/services/AuthoringService.ts @@ -125,12 +125,47 @@ interface Iparams { * * @description Authoring Service is responsible for management of the actions on a story */ -AuthoringService.$inject = ['$q', '$location', 'api', 'lock', 'autosave', 'confirm', 'privileges', 'desks', - 'superdeskFlags', 'notify', 'session', '$injector', 'moment', 'familyService', 'modal', 'archiveService']; -export function AuthoringService($q, $location, api, lock, autosave, confirm, privileges, desks, superdeskFlags, - notify, session, $injector, moment, familyService, modal, archiveService) { +AuthoringService.$inject = [ + '$q', + '$location', + 'api', + 'lock', + 'autosave', + 'confirm', + 'privileges', + 'desks', + 'superdeskFlags', + 'notify', + 'session', + '$injector', + 'moment', + 'familyService', + 'modal', + 'archiveService', +]; + +export function AuthoringService( + $q, + $location, + api, + lock, + autosave, + confirm, + privileges, + desks, + superdeskFlags, + notify, + session, + $injector, + moment, + familyService, + modal, + archiveService, +) { var self = this; + const isEditable = (item: Readonly>) => lock.isLockedInCurrentSession(item); + // TODO: have to trap desk update event for refereshing users desks. this.userDesks = []; const publishFromPersonal = appConfig?.features?.publishFromPersonal; @@ -283,18 +318,24 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr }); /** - * Close an item - * - * and save it if dirty, unlock if editable, and remove from work queue at all times + * * close an item and save it if dirty + * * unlock if editable + * * remove from work queue at all times + * * (is called after publishing) * * @param {Object} diff * @param {Object} orig * @param {boolean} isDirty $scope dirty status. */ - this.close = function closeAuthoring(diff, orig, isDirty, closeItem) { + this.close = function closeAuthoring( + diff: Readonly>, + orig: Readonly, + isDirty: boolean, + closeItem: boolean, + ): Promise { var promise = $q.when(); - if (this.isEditable(diff)) { + if (isEditable(diff)) { if (isDirty) { if (!_.includes(['published', 'corrected'], orig.state)) { promise = confirm.confirm() @@ -333,7 +374,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr this.publishConfirmation = function publishAuthoring(orig, diff, isDirty, action) { var promise = $q.when(); - if (this.isEditable(diff) && isDirty) { + if (isEditable(diff) && isDirty) { promise = confirm.confirmPublish(action) .then(angular.bind(this, function save() { return true; @@ -522,7 +563,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr var promise = $q.when(); if (isDirty) { - if (this.isEditable(diff)) { + if (isEditable(diff)) { promise = confirm.confirmSaveWork(message) .then(angular.bind(this, function save() { return this.saveWork(orig, diff); @@ -625,14 +666,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr }); }; - /** - * Test if an item is editable - * - * @param {Object} item - */ - this.isEditable = function isEditable(item) { - return lock.isLockedInCurrentSession(item); - }; + this.isEditable = isEditable; /** * Unlock an item - callback for item:unlock event From 8db12055fb92ee64d38dba75799c28c77343727c Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 22 Oct 2021 13:31:25 +0200 Subject: [PATCH 0082/1070] add a wrapper component to isolate interaction with angular; add initial data layer --- scripts/appConfig.ts | 2 +- .../authoring-integration-wrapper.tsx | 26 +++++ .../apps/authoring-react/authoring-react.tsx | 104 ++++++++++++++---- scripts/apps/authoring-react/data-layer.ts | 64 +++++++++++ .../directives/AuthoringEmbeddedDirective.ts | 2 +- scripts/apps/authoring/authoring/index.ts | 4 +- 6 files changed, 179 insertions(+), 23 deletions(-) create mode 100644 scripts/apps/authoring-react/authoring-integration-wrapper.tsx create mode 100644 scripts/apps/authoring-react/data-layer.ts diff --git a/scripts/appConfig.ts b/scripts/appConfig.ts index 32f57965bb..53cd42afc7 100644 --- a/scripts/appConfig.ts +++ b/scripts/appConfig.ts @@ -37,6 +37,6 @@ export const debugInfo = { translationsLoaded: false, }; -export const authoringReactViewEnabled = true; +export const authoringReactViewEnabled = false; export const extensions: IExtensions = {}; diff --git a/scripts/apps/authoring-react/authoring-integration-wrapper.tsx b/scripts/apps/authoring-react/authoring-integration-wrapper.tsx new file mode 100644 index 0000000000..266a1d42e9 --- /dev/null +++ b/scripts/apps/authoring-react/authoring-integration-wrapper.tsx @@ -0,0 +1,26 @@ +import React from 'react'; +import {IArticle} from 'superdesk-api'; +import ng from 'core/services/ng'; +import {AuthoringReact} from './authoring-react'; + +interface IProps { + itemId: IArticle['_id']; +} + +/** + * The purpose of the wrapper is to handle integration with the angular part of the application. + * The main component will not know about angular. + */ +export class AuthoringIntegrationWrapper extends React.PureComponent { + render() { + return ( + { + ng.get('authoringWorkspace').close(); + ng.get('$rootScope').$applyAsync(); + }} + /> + ); + } +} diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index d34f3f6b69..2411599a4c 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -1,17 +1,39 @@ import React from 'react'; import {IArticle} from 'superdesk-api'; -import ng from 'core/services/ng'; import {Button} from 'superdesk-ui-framework'; import {gettext} from 'core/utils'; - -// TODO: how to get item by ID +import {dataApi} from 'core/helpers/CrudManager'; +import {getContentProfile, IContentProfileV2} from './data-layer'; interface IProps { itemId: IArticle['_id']; + onClose(): void; +} + +interface IStateLoaded { + loading: false; + item: IArticle; + profile: IContentProfileV2; +} + +type IState = {loading: true} | IStateLoaded; + +function waitForCssAnimation(): Promise { + return new Promise((resolve) => { + setTimeout( + () => { + resolve(); + }, + + // transition time taken from styles/sass/layouts.scss #authoring-container + 500, + ); + }); } -interface IState { - cssOpeningAnimationCompleted: boolean; +function fetchArticle(id: IArticle['_id']): Promise { + // TODO: take published items into account + return dataApi.findOne('archive', id); } export class AuthoringReact extends React.PureComponent { @@ -19,34 +41,78 @@ export class AuthoringReact extends React.PureComponent { super(props); this.state = { - cssOpeningAnimationCompleted: false, + loading: true, }; } componentDidMount() { - setTimeout(() => { - this.setState({cssOpeningAnimationCompleted: true}); - }, 500); + Promise.all( + [ + fetchArticle(this.props.itemId).then((item) => { + return getContentProfile(item).then((profile) => { + return { + item, + profile, + }; + }); + }), + waitForCssAnimation(), + ], + ).then((res) => { + const [{item, profile}] = res; + + this.setState({loading: false, item, profile}); + }); } render() { - if (this.state.cssOpeningAnimationCompleted !== true) { + const state = this.state; + + if (state.loading === true) { return null; } return (
-
hello world
+
+

{gettext('Toolbar')}

+ +
+ +
+

{gettext('Header')}

+ + { + state.profile.header.map((field) => ( +
+ +
{state.item[field.name]}
+
+ )).toArray() + } +
-
+
+

{gettext('Content')}

-
); diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts new file mode 100644 index 0000000000..47a2fa9e5d --- /dev/null +++ b/scripts/apps/authoring-react/data-layer.ts @@ -0,0 +1,64 @@ +import {OrderedMap} from 'immutable'; +import {IArticle} from 'superdesk-api'; +import ng from 'core/services/ng'; + +export interface IAuthoringFieldV2 { + name: string; + type: 'plain-text' | 'html' | 'dropdown'; +} + +export type IFieldsV2 = OrderedMap; + +export interface IContentProfileV2 { + name: string; + header: IFieldsV2; + content: IFieldsV2; +} + +export function getContentProfile(item: IArticle): Promise { + interface IFakeScope { + schema: any, + editor: any; + fields: any; + } + + let fakeScope: Partial = {}; + + /** + * !!! The use of `setupAuthoring` outside of angular is experimental. + * I'm only using for getting some test data on the screen. + */ + return ng.get('content').setupAuthoring(item.profile, fakeScope, item).then(() => { + const {editor} = fakeScope; + const editorOrdered = + Object.keys(editor) + .map((key) => ({...editor[key], name: key})) + .sort((a, b) => a.order - b.order); + + let headerFields: IFieldsV2 = OrderedMap(); + let contentFields: IFieldsV2 = OrderedMap(); + + for (const editorItem of editorOrdered) { + const field: IAuthoringFieldV2 = { + name: editorItem.name, + type: 'plain-text', + }; + + if (editorItem.section === 'header') { + headerFields = headerFields.set(field.name, field); + } else if (editorItem.section === 'content') { + contentFields = contentFields.set(field.name, field); + } else { + throw new Error('invalid section'); + } + } + + const profile: IContentProfileV2 = { + name: 'test content profile', + header: headerFields, + content: contentFields, + }; + + return profile; + }); +} \ No newline at end of file diff --git a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts index f869d2041f..45a9121a0c 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts @@ -7,7 +7,7 @@ import {canPrintPreview} from 'apps/search/helpers'; AuthoringEmbeddedDirective.$inject = ['api', 'notify', '$filter']; export function AuthoringEmbeddedDirective(api, notify, $filter) { return { - template: authoringReactViewEnabled ? '
' : undefined, + template: authoringReactViewEnabled ? '
' : undefined, templateUrl: authoringReactViewEnabled ? undefined : 'scripts/apps/authoring/views/authoring.html', scope: { item: '=', diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 43df80fa30..f40201d1fb 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -32,7 +32,7 @@ import {AuthoringTopbar2React} from './authoring-topbar2-react'; import {appConfig} from 'appConfig'; import {FullPreview} from '../preview/fullPreview'; import {sdApi} from 'api'; -import {AuthoringReact} from 'apps/authoring-react/authoring-react'; +import {AuthoringIntegrationWrapper} from 'apps/authoring-react/authoring-integration-wrapper'; export interface IOnChangeParams { item: IArticle; @@ -102,7 +102,7 @@ angular.module('superdesk.apps.authoring', [ .directive('sdDashboardCard', directive.DashboardCard) .directive('sdSendItem', directive.SendItem) .component('sdCharacterCount', reactToAngular1(CharacterCount, ['item', 'html', 'limit'], [], 'display: inline')) - .component('sdAuthoringReact', reactToAngular1(AuthoringReact, ['itemId'], [])) + .component('sdAuthoringIntegrationWrapper', reactToAngular1(AuthoringIntegrationWrapper, ['itemId'], [])) .component('sdCharacterCountConfigButton', reactToAngular1( CharacterCountConfigButton, ['field'], [], 'display: inline', )) From e906070ef410608a575fba0a04f30ddecbef60b8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 22 Oct 2021 19:45:18 +0200 Subject: [PATCH 0083/1070] fix lint --- scripts/apps/authoring-react/data-layer.ts | 4 ++-- .../authoring/directives/AuthoringEmbeddedDirective.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts index 47a2fa9e5d..259e9a5589 100644 --- a/scripts/apps/authoring-react/data-layer.ts +++ b/scripts/apps/authoring-react/data-layer.ts @@ -17,7 +17,7 @@ export interface IContentProfileV2 { export function getContentProfile(item: IArticle): Promise { interface IFakeScope { - schema: any, + schema: any; editor: any; fields: any; } @@ -61,4 +61,4 @@ export function getContentProfile(item: IArticle): Promise { return profile; }); -} \ No newline at end of file +} diff --git a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts index 45a9121a0c..e272bdd950 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts @@ -7,7 +7,9 @@ import {canPrintPreview} from 'apps/search/helpers'; AuthoringEmbeddedDirective.$inject = ['api', 'notify', '$filter']; export function AuthoringEmbeddedDirective(api, notify, $filter) { return { - template: authoringReactViewEnabled ? '
' : undefined, + template: authoringReactViewEnabled + ? '
' + : undefined, templateUrl: authoringReactViewEnabled ? undefined : 'scripts/apps/authoring/views/authoring.html', scope: { item: '=', From f5defed104caf9d692a8c8ba061a21094c405a1d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 22 Oct 2021 19:44:08 +0200 Subject: [PATCH 0084/1070] remove editor2 --- package-lock.json | 2365 +---------------- package.json | 4 - .../directives/ArticleEditDirective.ts | 9 - .../authoring/services/HistoryFactory.ts | 9 +- scripts/apps/authoring/macros/macros.spec.ts | 2 - scripts/apps/authoring/styles/authoring.scss | 53 - .../apps/authoring/tests/authoring.spec.ts | 7 +- .../apps/authoring/views/article-edit.html | 134 +- scripts/apps/index.ts | 1 - scripts/apps/ingest/services/SendService.ts | 1 - scripts/apps/workspace/content/constants.ts | 3 +- .../content/views/schema-editor.html | 10 - scripts/core/editor2/add-content.ts | 146 - scripts/core/editor2/add-embed.ctrl.ts | 133 - scripts/core/editor2/customAnchor.ts | 48 - scripts/core/editor2/editor.ctrl.ts | 401 --- scripts/core/editor2/editor.spec.ts | 165 -- scripts/core/editor2/editor.ts | 1771 ------------ .../core/editor2/embedCodeHandlers.spec.ts | 107 - scripts/core/editor2/embedCodeHandlers.ts | 25 - scripts/core/editor2/index.ts | 13 - scripts/core/editor2/styles/editor.scss | 245 -- scripts/core/editor2/views/add-content.html | 25 - scripts/core/editor2/views/add-embed.html | 21 - scripts/core/editor2/views/block-embed.html | 37 - scripts/core/editor2/views/block-text.html | 29 - scripts/core/editor2/views/editor.html | 45 - scripts/core/editor3/index.ts | 12 +- scripts/core/editor3/service.ts | 3 +- scripts/core/index.ts | 1 - scripts/core/spellcheck/spellcheck.spec.ts | 1 - scripts/core/superdesk-api.d.ts | 1 - scripts/index.ts | 2 - scripts/vendor.ts | 2 - styles/sass/app.scss | 1 - styles/sass/medium-editor.scss | 274 -- webpack.config.js | 7 - 37 files changed, 59 insertions(+), 6054 deletions(-) delete mode 100644 scripts/core/editor2/add-content.ts delete mode 100644 scripts/core/editor2/add-embed.ctrl.ts delete mode 100644 scripts/core/editor2/customAnchor.ts delete mode 100644 scripts/core/editor2/editor.ctrl.ts delete mode 100644 scripts/core/editor2/editor.spec.ts delete mode 100644 scripts/core/editor2/editor.ts delete mode 100644 scripts/core/editor2/embedCodeHandlers.spec.ts delete mode 100644 scripts/core/editor2/embedCodeHandlers.ts delete mode 100644 scripts/core/editor2/index.ts delete mode 100644 scripts/core/editor2/styles/editor.scss delete mode 100644 scripts/core/editor2/views/add-content.html delete mode 100644 scripts/core/editor2/views/add-embed.html delete mode 100644 scripts/core/editor2/views/block-embed.html delete mode 100644 scripts/core/editor2/views/block-text.html delete mode 100644 scripts/core/editor2/views/editor.html delete mode 100644 styles/sass/medium-editor.scss diff --git a/package-lock.json b/package-lock.json index b11a0a3984..7b24f524d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -540,14 +540,6 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, - "active-x-obfuscator": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz", - "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=", - "requires": { - "zeparser": "0.0.5" - } - }, "addressparser": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz", @@ -696,108 +688,6 @@ "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.32.tgz", "integrity": "sha1-0H/qdSgfJbqUpb5bRt8qAsXjWDY=" }, - "angular-embed": { - "version": "github:superdesk/angular-embed#d75968e9eedc2b255f68d0c298a6c91981bc9444", - "from": "github:superdesk/angular-embed#d75968e" - }, - "angular-embedly": { - "version": "github:Urigo/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", - "from": "github:Urigo/angular-embedly#0.0.8", - "requires": { - "gulp": "~3.8.2", - "gulp-concat": "~2.2.0", - "gulp-uglify": "~0.3.1", - "karma": "~0.12.16", - "karma-chrome-launcher": "~0.1.4", - "karma-jasmine": "~0.1.5" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "karma": { - "version": "0.12.37", - "resolved": "https://registry.npmjs.org/karma/-/karma-0.12.37.tgz", - "integrity": "sha1-Gp9/3szWneLoNeBO26wuzT+mReQ=", - "requires": { - "chokidar": "^1.0.1", - "colors": "^1.1.0", - "connect": "^2.29.2", - "di": "^0.0.1", - "glob": "^5.0.6", - "graceful-fs": "^3.0.6", - "http-proxy": "^0.10", - "lodash": "^3.8.0", - "log4js": "^0.6.25", - "mime": "^1.3.4", - "minimatch": "^2.0.7", - "optimist": "^0.6.1", - "q": "^1.4.1", - "rimraf": "^2.3.3", - "socket.io": "0.9.16", - "source-map": "^0.4.2", - "useragent": "^2.1.6" - } - }, - "karma-chrome-launcher": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.12.tgz", - "integrity": "sha1-CsDiLlc2UPZUExL9ynlcOCTM+WI=", - "requires": { - "which": "^1.0.9" - } - }, - "karma-jasmine": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.6.tgz", - "integrity": "sha1-MFRQV2mOvcvGMTLUe+Elt1svvFU=" - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "requires": { - "brace-expansion": "^1.0.0" - } - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "angular-gettext": { "version": "github:tomaskikutis/angular-gettext#5615f0058ecf7f4aeeb7ec1a24e2cff4426fffa6", "from": "github:tomaskikutis/angular-gettext#master" @@ -859,135 +749,16 @@ "type-fest": "^0.21.3" } }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "requires": { - "ansi-wrap": "0.1.0" - } - }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" - }, - "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - } - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" - }, "are-we-there-yet": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", @@ -1054,11 +825,6 @@ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" - }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -1081,11 +847,6 @@ "is-string": "^1.0.7" } }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -1274,11 +1035,6 @@ "postcss-value-parser": "^3.2.3" } }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1469,26 +1225,6 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, - "base64-url": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", - "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg=" - }, - "base64id": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", - "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=" - }, - "basic-auth": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz", - "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA=" - }, - "basic-auth-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI=" - }, "batch": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", @@ -1502,11 +1238,6 @@ "tweetnacl": "^0.14.3" } }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" - }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1637,38 +1368,6 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" }, - "body-parser": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", - "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=", - "requires": { - "bytes": "2.1.0", - "content-type": "~1.0.1", - "debug": "~2.2.0", - "depd": "~1.0.1", - "http-errors": "~1.3.1", - "iconv-lite": "0.4.11", - "on-finished": "~2.3.0", - "qs": "4.0.0", - "raw-body": "~2.1.2", - "type-is": "~1.6.6" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -2067,18 +1766,6 @@ "lazy-cache": "^1.0.3" } }, - "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", - "requires": { - "ansi-styles": "^1.1.0", - "escape-string-regexp": "^1.0.0", - "has-ansi": "^0.1.0", - "strip-ansi": "^0.3.0", - "supports-color": "^0.2.0" - } - }, "change-case": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz", @@ -2251,46 +1938,6 @@ } } }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - }, - "dependencies": { - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -2473,11 +2120,6 @@ } } }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" - }, "clsx": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", @@ -2546,11 +2188,6 @@ "color-name": "^1.0.0" } }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" - }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", @@ -2564,7 +2201,8 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true }, "combine-lists": { "version": "1.0.1", @@ -2583,11 +2221,6 @@ "delayed-stream": "~1.0.0" } }, - "commander": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=" - }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -2690,104 +2323,25 @@ } } }, - "connect": { - "version": "2.30.2", - "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", - "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=", - "requires": { - "basic-auth-connect": "1.0.0", - "body-parser": "~1.13.3", - "bytes": "2.1.0", - "compression": "~1.5.2", - "connect-timeout": "~1.6.2", - "content-type": "~1.0.1", - "cookie": "0.1.3", - "cookie-parser": "~1.3.5", - "cookie-signature": "1.0.6", - "csurf": "~1.8.3", - "debug": "~2.2.0", - "depd": "~1.0.1", - "errorhandler": "~1.4.2", - "express-session": "~1.11.3", - "finalhandler": "0.4.0", - "fresh": "0.3.0", - "http-errors": "~1.3.1", - "method-override": "~2.3.5", - "morgan": "~1.6.1", - "multiparty": "3.3.2", - "on-headers": "~1.0.0", - "parseurl": "~1.3.0", - "pause": "0.1.0", - "qs": "4.0.0", - "response-time": "~2.3.1", - "serve-favicon": "~2.3.0", - "serve-index": "~1.7.2", - "serve-static": "~1.10.0", - "type-is": "~1.6.6", - "utils-merge": "1.0.0", - "vhost": "~3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" - }, - "connect-timeout": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", - "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=", - "requires": { - "debug": "~2.2.0", - "http-errors": "~1.3.1", - "ms": "0.7.1", - "on-headers": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "constant-case": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", - "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", + "connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" + }, + "console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "constant-case": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", + "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", "requires": { "snake-case": "^2.1.0", "upper-case": "^1.1.1" @@ -2819,20 +2373,6 @@ "safe-buffer": "~5.1.1" } }, - "cookie": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=" - }, - "cookie-parser": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", - "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6" - } - }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2853,11 +2393,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, - "crc": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", - "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=" - }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -2980,16 +2515,6 @@ } } }, - "csrf": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz", - "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=", - "requires": { - "rndm": "1.2.0", - "tsscmp": "1.0.5", - "uid-safe": "2.1.4" - } - }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -3119,17 +2644,6 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" }, - "csurf": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", - "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6", - "csrf": "~3.0.0", - "http-errors": "~1.3.1" - } - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -3184,11 +2698,6 @@ "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", "dev": true }, - "dateformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", - "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" - }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -3212,35 +2721,6 @@ "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz", "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=" }, - "deep-equal": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz", - "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==", - "requires": { - "call-bind": "^1.0.0", - "es-get-iterator": "^1.1.1", - "get-intrinsic": "^1.0.1", - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.2", - "is-regex": "^1.1.1", - "isarray": "^2.0.5", - "object-is": "^1.1.4", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.3", - "which-boxed-primitive": "^1.0.1", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.2" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - } - } - }, "deep-for-each": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-1.0.6.tgz", @@ -3254,19 +2734,6 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, - "deepmerge": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz", - "integrity": "sha1-iQa/nlJaT78bIDsq/LRkAkmCEhk=" - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "^1.0.2" - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3368,16 +2835,6 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, - "depd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=" - }, - "deprecated": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", - "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" - }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -3392,11 +2849,6 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, "detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", @@ -3405,7 +2857,8 @@ "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=" + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", + "dev": true }, "diff": { "version": "3.5.0", @@ -3579,14 +3032,6 @@ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.4.0.tgz", "integrity": "sha512-8s9FFuKC+lOWGwJ0b3om2PF+uXrqQPaEQlPJI7UxdzxTYGMeKouMPA9+YlPn52zcAVElIZtd2tXj6eQmvlKelw==" }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "requires": { - "readable-stream": "~1.1.9" - } - }, "each-async": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz", @@ -3683,24 +3128,6 @@ } } }, - "end-of-stream": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", - "requires": { - "once": "~1.3.0" - }, - "dependencies": { - "once": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", - "requires": { - "wrappy": "1" - } - } - } - }, "engine.io": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz", @@ -4098,31 +3525,6 @@ "is-arrayish": "^0.2.1" } }, - "errorhandler": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz", - "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=", - "requires": { - "accepts": "~1.3.0", - "escape-html": "~1.0.3" - }, - "dependencies": { - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" - } - } - }, "es-abstract": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", @@ -4156,28 +3558,6 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, - "es-get-iterator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", - "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.0", - "has-symbols": "^1.0.1", - "is-arguments": "^1.1.0", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - } - } - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -4583,11 +3963,6 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, - "etag": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=" - }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -4821,14 +4196,6 @@ } } }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -5050,45 +4417,6 @@ } } }, - "express-session": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", - "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6", - "crc": "3.3.0", - "debug": "~2.2.0", - "depd": "~1.0.1", - "on-headers": "~1.0.0", - "parseurl": "~1.3.0", - "uid-safe": "~2.0.0", - "utils-merge": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - }, - "uid-safe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", - "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=", - "requires": { - "base64-url": "1.2.1" - } - } - } - }, "ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -5243,17 +4571,6 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5382,42 +4699,6 @@ } } }, - "finalhandler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=", - "requires": { - "debug": "~2.2.0", - "escape-html": "1.0.2", - "on-finished": "~2.3.0", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw=" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" - }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -5453,49 +4734,6 @@ } } }, - "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" - }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -5544,11 +4782,6 @@ "for-in": "^1.0.1" } }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -5577,11 +4810,6 @@ "map-cache": "^0.2.2" } }, - "fresh": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=" - }, "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -5723,14 +4951,6 @@ } } }, - "gaze": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", - "requires": { - "globule": "~0.1.0" - } - }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -5963,98 +5183,6 @@ } } }, - "glob-stream": { - "version": "3.1.18", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", - "requires": { - "glob": "^4.3.1", - "glob2base": "^0.0.12", - "minimatch": "^2.0.1", - "ordered-read-streams": "^0.1.0", - "through2": "^0.6.1", - "unique-stream": "^1.0.0" - }, - "dependencies": { - "glob": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^2.0.1", - "once": "^1.3.0" - } - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "requires": { - "brace-expansion": "^1.0.0" - } - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, - "glob-watcher": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", - "requires": { - "gaze": "^0.5.1" - } - }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", - "requires": { - "find-index": "^0.1.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -6079,68 +5207,6 @@ } } }, - "globule": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", - "requires": { - "glob": "~3.1.21", - "lodash": "~1.0.1", - "minimatch": "~0.2.11" - }, - "dependencies": { - "glob": { - "version": "3.1.21", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", - "requires": { - "graceful-fs": "~1.2.0", - "inherits": "1", - "minimatch": "~0.2.11" - } - }, - "graceful-fs": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" - }, - "inherits": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" - }, - "lodash": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" - }, - "minimatch": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, - "glogg": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", - "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", - "requires": { - "sparkles": "^1.0.0" - } - }, - "graceful-fs": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz", - "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==", - "requires": { - "natives": "^1.1.3" - } - }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", @@ -6629,265 +5695,6 @@ "lodash": "^4.7.0" } }, - "gulp": { - "version": "3.8.11", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz", - "integrity": "sha1-1Vfgpyg+tBNkkZabBJd2eXLx0oo=", - "requires": { - "archy": "^1.0.0", - "chalk": "^0.5.0", - "deprecated": "^0.0.1", - "gulp-util": "^3.0.0", - "interpret": "^0.3.2", - "liftoff": "^2.0.1", - "minimist": "^1.1.0", - "orchestrator": "^0.3.0", - "pretty-hrtime": "^0.2.0", - "semver": "^4.1.0", - "tildify": "^1.0.0", - "v8flags": "^2.0.2", - "vinyl-fs": "^0.3.0" - }, - "dependencies": { - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" - } - } - }, - "gulp-concat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.2.0.tgz", - "integrity": "sha1-7vw+FYDEzKxkOAbSBnwyK0QaY0Y=", - "requires": { - "gulp-util": "^2.2.5", - "through": "^2.3.4" - }, - "dependencies": { - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "requires": { - "get-stdin": "^4.0.1", - "meow": "^3.3.0" - } - }, - "gulp-util": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", - "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", - "requires": { - "chalk": "^0.5.0", - "dateformat": "^1.0.7-1.2.3", - "lodash._reinterpolate": "^2.4.1", - "lodash.template": "^2.4.1", - "minimist": "^0.2.0", - "multipipe": "^0.1.0", - "through2": "^0.5.0", - "vinyl": "^0.2.1" - } - }, - "lodash._reinterpolate": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", - "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=" - }, - "lodash.escape": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", - "requires": { - "lodash._escapehtmlchar": "~2.4.1", - "lodash._reunescapedhtml": "~2.4.1", - "lodash.keys": "~2.4.1" - } - }, - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - }, - "lodash.template": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", - "requires": { - "lodash._escapestringchar": "~2.4.1", - "lodash._reinterpolate": "~2.4.1", - "lodash.defaults": "~2.4.1", - "lodash.escape": "~2.4.1", - "lodash.keys": "~2.4.1", - "lodash.templatesettings": "~2.4.1", - "lodash.values": "~2.4.1" - } - }, - "lodash.templatesettings": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", - "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", - "requires": { - "lodash._reinterpolate": "~2.4.1", - "lodash.escape": "~2.4.1" - } - }, - "minimist": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", - "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", - "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", - "requires": { - "readable-stream": "~1.0.17", - "xtend": "~3.0.0" - } - }, - "vinyl": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", - "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", - "requires": { - "clone-stats": "~0.0.1" - } - }, - "xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=" - } - } - }, - "gulp-uglify": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-0.3.2.tgz", - "integrity": "sha1-+je/bUrZopo0nGy6hiq7Iuumeqw=", - "requires": { - "deepmerge": ">=0.2.7 <0.3.0-0", - "gulp-util": ">=3.0.0 <4.0.0-0", - "through2": ">=0.6.1 <1.0.0-0", - "uglify-js": "2.4.6" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "requires": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^2.0.0", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", - "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "requires": { - "glogg": "^1.0.0" - } - }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", @@ -6915,14 +5722,6 @@ "function-bind": "^1.1.1" } }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "requires": { - "ansi-regex": "^0.2.0" - } - }, "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -6961,14 +5760,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "requires": { - "sparkles": "^1.0.0" - } - }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -7132,14 +5923,6 @@ "react-is": "^16.7.0" } }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", @@ -7368,49 +6151,17 @@ "http-errors": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", - "requires": { - "inherits": "~2.0.1", - "statuses": "1" - } - }, - "http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" - }, - "http-proxy": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz", - "integrity": "sha1-FLoM6qIZf4n6MN6p57CeGc2Twi8=", - "requires": { - "colors": "0.x.x", - "optimist": "0.6.x", - "pkginfo": "0.3.x", - "utile": "~0.2.1" - }, - "dependencies": { - "colors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - } + "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", + "requires": { + "inherits": "~2.0.1", + "statuses": "1" } }, + "http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" + }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", @@ -7631,16 +6382,6 @@ } } }, - "i": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz", - "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==" - }, - "iconv-lite": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", - "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4=" - }, "icss-replace-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", @@ -7790,11 +6531,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, "inquirer": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", @@ -7891,11 +6627,6 @@ "side-channel": "^1.0.4" } }, - "interpret": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz", - "integrity": "sha1-CIwl3nMcbFsRKpDwBxz69Fnlp7s=" - }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -7919,15 +6650,6 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -8108,11 +6830,6 @@ "lower-case": "^1.1.0" } }, - "is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" - }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -8225,25 +6942,12 @@ "has-tostringtag": "^1.0.0" } }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, - "is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" - }, "is-shared-array-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", @@ -8284,31 +6988,11 @@ "has-symbols": "^1.0.2" } }, - "is-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz", - "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0" - } - }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, "is-upper-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", @@ -8322,11 +7006,6 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, - "is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" - }, "is-weakref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", @@ -8335,11 +7014,6 @@ "call-bind": "^1.0.0" } }, - "is-weakset": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", - "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==" - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -8353,7 +7027,9 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true, + "optional": true }, "isbinaryfile": { "version": "3.0.3", @@ -9138,21 +7814,6 @@ "dev": true, "optional": true }, - "liftoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", - "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", - "requires": { - "extend": "^3.0.0", - "findup-sync": "^2.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" - } - }, "load-grunt-config": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-0.19.2.tgz", @@ -9289,108 +7950,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" - }, - "lodash._escapehtmlchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", - "requires": { - "lodash._htmlescapes": "~2.4.1" - } - }, - "lodash._escapestringchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", - "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=" - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" - }, - "lodash._htmlescapes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", - "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=" - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" - }, - "lodash._isnative": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", - "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=" - }, - "lodash._objecttypes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", - "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=" - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" - }, - "lodash._reunescapedhtml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", - "requires": { - "lodash._htmlescapes": "~2.4.1", - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" - }, - "lodash._shimkeys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", - "requires": { - "lodash._objecttypes": "~2.4.1" - } - }, "lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", @@ -9411,35 +7970,6 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, - "lodash.defaults": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", - "requires": { - "lodash._objecttypes": "~2.4.1", - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "requires": { - "lodash._root": "^3.0.0" - } - }, "lodash.filter": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", @@ -9461,40 +7991,12 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" - }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, - "lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "requires": { - "lodash._objecttypes": "~2.4.1" - } - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, "lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", @@ -9525,11 +8027,6 @@ "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" - }, "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", @@ -9540,31 +8037,6 @@ "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=" }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" - } - }, "lodash.unescape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", @@ -9576,53 +8048,6 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, - "lodash.values": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", - "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", - "requires": { - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "log4js": { - "version": "0.6.38", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", - "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", - "requires": { - "readable-stream": "~1.0.2", - "semver": "~4.3.3" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" - } - } - }, "loggly": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz", @@ -9872,11 +8297,6 @@ "lower-case": "^1.1.2" } }, - "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" - }, "mailcomposer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz", @@ -9935,14 +8355,6 @@ } } }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -9986,16 +8398,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "medium-editor": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/medium-editor/-/medium-editor-5.23.3.tgz", - "integrity": "sha512-he9/TdjX8f8MGdXGfCs8AllrYnqXJJvjNkDKmPg3aPW/uoIrlRqtkFthrwvmd+u4QyzEiadhCCM0EwTiRdUCJw==" - }, - "medium-editor-tables": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/medium-editor-tables/-/medium-editor-tables-0.6.1.tgz", - "integrity": "sha1-CKWZgvYdI4kp4S/hiszCMGLpbPM=" - }, "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", @@ -10083,37 +8485,6 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, - "method-override": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz", - "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=", - "requires": { - "debug": "2.6.9", - "methods": "~1.1.2", - "parseurl": "~1.3.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" - } - } - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -10268,33 +8639,6 @@ "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==", "dev": true }, - "morgan": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", - "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=", - "requires": { - "basic-auth": "~1.0.3", - "debug": "~2.2.0", - "depd": "~1.0.1", - "on-finished": "~2.3.0", - "on-headers": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10325,33 +8669,11 @@ "minimatch": "^3.0.0" } }, - "multiparty": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", - "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8=", - "requires": { - "readable-stream": "~1.1.9", - "stream-counter": "~0.2.0" - } - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "requires": { - "duplexer2": "0.0.2" - } - }, "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, - "nan": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", - "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=" - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -10370,11 +8692,6 @@ "to-regex": "^3.0.1" } }, - "natives": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", - "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -10388,11 +8705,6 @@ "xml-char-classes": "^1.0.0" } }, - "ncp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", - "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=" - }, "nearley": { "version": "2.20.1", "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", @@ -10935,11 +9247,6 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" - }, "object-component": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", @@ -11012,17 +9319,6 @@ "object-keys": "^1.1.1" } }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, "object.entries": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", @@ -11043,15 +9339,6 @@ "es-abstract": "^1.19.1" } }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -11131,14 +9418,6 @@ "is-wsl": "^1.1.0" } }, - "optimist": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", - "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", - "requires": { - "wordwrap": "~0.0.2" - } - }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -11152,26 +9431,6 @@ "word-wrap": "~1.2.3" } }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=" - }, - "orchestrator": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", - "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", - "requires": { - "end-of-stream": "~0.1.5", - "sequencify": "~0.0.7", - "stream-consume": "~0.1.0" - } - }, - "ordered-read-streams": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", - "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" - }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -11391,16 +9650,6 @@ "safe-buffer": "^5.1.1" } }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -11435,16 +9684,6 @@ "error-ex": "^1.2.0" } }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" - }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -11617,20 +9856,7 @@ "dev": true, "optional": true } - } - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + } }, "path-to-regexp": { "version": "0.1.7", @@ -11654,11 +9880,6 @@ } } }, - "pause": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", - "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q=" - }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", @@ -11726,11 +9947,6 @@ "find-up": "^1.0.0" } }, - "pkginfo": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", - "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=" - }, "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", @@ -11751,11 +9967,6 @@ "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.11.tgz", "integrity": "sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg==" }, - "policyfile": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz", - "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0=" - }, "popper.js": { "version": "1.14.4", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", @@ -12377,11 +10588,6 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, - "pretty-hrtime": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz", - "integrity": "sha1-1P2INR46R0H4Fzr31qS4RvmJXAA=" - }, "primeicons": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-2.0.0.tgz", @@ -12598,11 +10804,6 @@ "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", "dev": true }, - "qs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", - "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=" - }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", @@ -12659,11 +10860,6 @@ "ret": "~0.1.10" } }, - "random-bytes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", - "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -12713,28 +10909,6 @@ "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.22.3.tgz", "integrity": "sha512-pIzHpAggyTOGJE3ruAKdZNK5qhO4V21kR7lwpdUM875yHpq1cqeGzvs78/RufF3g7NaAvVmMPCbaV9uUhQzJ3A==" }, - "raw-body": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", - "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=", - "requires": { - "bytes": "2.4.0", - "iconv-lite": "0.4.13", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", - "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=" - }, - "iconv-lite": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=" - } - } - }, "react": { "version": "16.9.0", "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", @@ -13054,6 +11228,8 @@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -13140,12 +11316,6 @@ "strip-indent": "^1.0.1" } }, - "redis": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz", - "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=", - "optional": true - }, "redis-commands": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", @@ -13309,11 +11479,6 @@ "is-finite": "^1.0.0" } }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" - }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -13431,15 +11596,6 @@ } } }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -13465,22 +11621,6 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, - "response-time": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", - "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", - "requires": { - "depd": "~1.1.0", - "on-headers": "~1.0.1" - }, - "dependencies": { - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - } - } - }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -13520,11 +11660,6 @@ "inherits": "^2.0.1" } }, - "rndm": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", - "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" - }, "rst-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", @@ -13792,55 +11927,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "send": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", - "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=", - "requires": { - "debug": "~2.2.0", - "depd": "~1.1.0", - "destroy": "~1.0.4", - "escape-html": "~1.0.3", - "etag": "~1.7.0", - "fresh": "0.3.0", - "http-errors": "~1.3.1", - "mime": "1.3.4", - "ms": "0.7.1", - "on-finished": "~2.3.0", - "range-parser": "~1.0.3", - "statuses": "~1.2.1" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - }, - "statuses": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg=" - } - } - }, "sentence-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", @@ -13850,29 +11936,6 @@ "upper-case-first": "^1.1.2" } }, - "sequencify": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", - "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" - }, - "serve-favicon": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz", - "integrity": "sha1-3UGeJo3gEqtysxnTN/IQUBP5OB8=", - "requires": { - "etag": "~1.7.0", - "fresh": "0.3.0", - "ms": "0.7.2", - "parseurl": "~1.3.1" - }, - "dependencies": { - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=" - } - } - }, "serve-index": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz", @@ -13902,16 +11965,6 @@ } } }, - "serve-static": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", - "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=", - "requires": { - "escape-html": "~1.0.3", - "parseurl": "~1.3.1", - "send": "0.13.2" - } - }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -14028,11 +12081,6 @@ "object-inspect": "^1.9.0" } }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" - }, "signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -14224,41 +12272,12 @@ "hoek": "2.x.x" } }, - "socket.io": { - "version": "0.9.16", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", - "integrity": "sha1-O6sEROSbVfu8FXQk29Qao3WlGnY=", - "requires": { - "base64id": "0.1.0", - "policyfile": "0.0.4", - "redis": "0.7.3", - "socket.io-client": "0.9.16" - } - }, "socket.io-adapter": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", "dev": true }, - "socket.io-client": { - "version": "0.9.16", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz", - "integrity": "sha1-TadRXF53MEHRtCOXBBW8xDDzX8Y=", - "requires": { - "active-x-obfuscator": "0.0.1", - "uglify-js": "1.2.5", - "ws": "0.4.x", - "xmlhttprequest": "1.4.2" - }, - "dependencies": { - "uglify-js": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", - "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY=" - } - } - }, "socket.io-parser": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz", @@ -14421,11 +12440,6 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, - "sparkles": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", - "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" - }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -14666,19 +12680,6 @@ } } }, - "stream-consume": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", - "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" - }, - "stream-counter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", - "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=", - "requires": { - "readable-stream": "~1.1.8" - } - }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", @@ -14835,7 +12836,9 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true, + "optional": true }, "stringstream": { "version": "0.0.6", @@ -14844,23 +12847,6 @@ "dev": true, "optional": true }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "requires": { - "ansi-regex": "^0.2.1" - } - }, - "strip-bom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", - "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", - "requires": { - "first-chunk-stream": "^1.0.0", - "is-utf8": "^0.2.0" - } - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -15412,11 +13398,6 @@ } } }, - "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" - }, "svgo": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", @@ -15523,44 +13504,6 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "thunkify": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", @@ -15573,19 +13516,6 @@ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, - "tildify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", - "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", - "requires": { - "os-homedir": "^1.0.0" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" - }, "timers-browserify": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", @@ -15601,11 +13531,6 @@ "dev": true, "optional": true }, - "tinycolor": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", - "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=" - }, "title-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", @@ -15827,7 +13752,9 @@ "tsscmp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=" + "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=", + "dev": true, + "optional": true }, "tsutils": { "version": "3.21.0", @@ -15924,27 +13851,6 @@ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==" }, - "uglify-js": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz", - "integrity": "sha1-MXZqTYIrq/XzLBQJYlHtklkpitM=", - "requires": { - "async": "~0.2.6", - "optimist": "~0.3.5", - "source-map": "~0.1.7", - "uglify-to-browserify": "~1.0.0" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "uglify-to-browserify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", @@ -15972,14 +13878,6 @@ } } }, - "uid-safe": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz", - "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=", - "requires": { - "random-bytes": "~1.0.0" - } - }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -15997,11 +13895,6 @@ "which-boxed-primitive": "^1.0.2" } }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, "uncontrollable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz", @@ -16041,11 +13934,6 @@ "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, - "unique-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", - "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -16163,31 +14051,6 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" - }, - "useragent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", - "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - } - } - }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -16208,24 +14071,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "utile": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", - "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", - "requires": { - "async": "~0.2.9", - "deep-equal": "*", - "i": "0.3.x", - "mkdirp": "0.x.x", - "ncp": "0.4.x", - "rimraf": "2.x.x" - } - }, - "utils-merge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" - }, "uuid": { "version": "8.3.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", @@ -16243,14 +14088,6 @@ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" }, - "v8flags": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", - "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", - "requires": { - "user-home": "^1.1.1" - } - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16287,72 +14124,6 @@ } } }, - "vhost": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", - "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=" - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "requires": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" - } - }, - "vinyl-fs": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", - "requires": { - "defaults": "^1.0.0", - "glob-stream": "^3.1.5", - "glob-watcher": "^0.0.6", - "graceful-fs": "^3.0.0", - "mkdirp": "^0.5.0", - "strip-bom": "^1.0.0", - "through2": "^0.6.1", - "vinyl": "^0.4.0" - }, - "dependencies": { - "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - }, - "vinyl": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", - "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", - "requires": { - "clone": "^0.2.0", - "clone-stats": "^0.0.1" - } - } - } - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -17117,35 +14888,11 @@ "is-symbol": "^1.0.3" } }, - "which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "requires": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - } - }, "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, - "which-typed-array": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz", - "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.7" - } - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -17203,7 +14950,8 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true }, "wrap-ansi": { "version": "2.1.0", @@ -17260,27 +15008,11 @@ "mkdirp": "^0.5.1" } }, - "ws": { - "version": "0.4.32", - "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", - "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", - "requires": { - "commander": "~2.1.0", - "nan": "~1.0.0", - "options": ">=0.0.5", - "tinycolor": "0.x" - } - }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=" }, - "xmlhttprequest": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz", - "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA=" - }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", @@ -17348,11 +15080,6 @@ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true - }, - "zeparser": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz", - "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI=" } } } diff --git a/package.json b/package.json index 62baf5ddda..c027ce2121 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,6 @@ "angular": "1.6.9", "angular-contenteditable": "0.3.9", "angular-dynamic-locale": "0.1.32", - "angular-embed": "github:superdesk/angular-embed#d75968e", - "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", @@ -88,8 +86,6 @@ "load-grunt-config": "0.19.2", "load-grunt-tasks": "3.5.2", "lodash": "4.17.19", - "medium-editor": "5.23.3", - "medium-editor-tables": "0.6.1", "ment.io": "0.9.23", "moment": "2.20.1", "moment-timezone": "0.5.14", diff --git a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts index 0798f30a7c..ce49964fe8 100644 --- a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts +++ b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts @@ -147,15 +147,6 @@ export function ArticleEditDirective( } }); - // watch item and save every change in history in order to perform undo/redo later - // ONLY for editor2 (with blocks) - try { - angular.module('superdesk.apps.editor2'); - history.watch('item', mainEditScope || scope); - } catch (e) { - // no-op - } - scope.$on('History.undone', triggerAutosave); scope.$on('History.redone', triggerAutosave); diff --git a/scripts/apps/authoring/authoring/services/HistoryFactory.ts b/scripts/apps/authoring/authoring/services/HistoryFactory.ts index 59252c13c3..7a96a8450b 100644 --- a/scripts/apps/authoring/authoring/services/HistoryFactory.ts +++ b/scripts/apps/authoring/authoring/services/HistoryFactory.ts @@ -23,14 +23,7 @@ export function HistoryFactory(History, $window, $timeout) { }; var onHistoryKeydown = function(event) { onHistoryKey(event, () => { - const editor2FieldsExist = document.querySelector('[sd-text-editor]') != null; - - if (editor2FieldsExist) { - // preventing default generally breaks undo via ctrl+z for native inputs/textareas, - // but is required for editor2 - event.preventDefault(); - } - // action is on keydown becuase command key (event.metakey) on OSX is not detected on keyup events + // action is on keydown because command key (event.metakey) on OSX is not detected on keyup events // for some reason. scope.$apply(() => { KeyOperations[event.keyCode].bind(History)(expression, scope); diff --git a/scripts/apps/authoring/macros/macros.spec.ts b/scripts/apps/authoring/macros/macros.spec.ts index 0af3c777a1..d142df5754 100644 --- a/scripts/apps/authoring/macros/macros.spec.ts +++ b/scripts/apps/authoring/macros/macros.spec.ts @@ -25,7 +25,6 @@ describe('macros', () => { }, ]; - beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); @@ -39,7 +38,6 @@ describe('macros', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.apps.authoring.macros')); beforeEach(window.module('superdesk.apps.authoring.autosave')); diff --git a/scripts/apps/authoring/styles/authoring.scss b/scripts/apps/authoring/styles/authoring.scss index 5f93c57810..0b65f16916 100644 --- a/scripts/apps/authoring/styles/authoring.scss +++ b/scripts/apps/authoring/styles/authoring.scss @@ -140,59 +140,6 @@ bottom: 32px; } - -// Medium editor -// ------------------------------------------------- -.medium-editor-toolbar-actions { - li button { - height: 30px !important; - min-width: 40px !important; - padding-top: 10px !important; - } -} -.medium-toolbar-arrow-under:after { - top: 40px !important; -} - -.text-editor-info { - font-size: 89%; -} - -.text-editor, .text-editor.medium-editor-element { - min-height: 20px; - - .sderror { - border-bottom: 1px dotted #cc0000; - background-color: rgba(204,0,0,0.1); - line-height: normal; - } - - .sdfindreplace { - background-color: rgba(0,0,0,0.1); - } - - .sdfindreplace.sdactive { - background-color: rgba(255,230,0,1); - } - - a { - color: #5d9bc0; - } -} - -.typing { - .text-editor { - .sderror, .typing .sdfindreplace { - border-bottom: none; - background-color: transparent; - } - - &.clone { - display: none; - } - } -} - // Placeholders // ------------------------------------------------- [contenteditable=true] { diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index 3fb3c3f44c..feb1c28818 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -13,7 +13,6 @@ describe('authoring', () => { $provide.constant('lodash', _); })); - beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); @@ -27,7 +26,6 @@ describe('authoring', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.apps.extension-points')); beforeEach(window.module('superdesk.apps.spellcheck')); @@ -636,7 +634,6 @@ describe('Item Crops directive', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); it('showCrops return true if image renditions are present', inject(($rootScope, $compile, $q, metadata, vocabularies) => { @@ -2209,14 +2206,12 @@ describe('send item directive', () => { server: {url: undefined, ws: undefined}, iframely: {key: '123'}, editor: {}, - features: {onlyEditor3: false}, }; Object.assign(appConfig, testConfig); }); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.authoring')); beforeEach(window.module('superdesk.templates-cache')); @@ -2428,7 +2423,7 @@ describe('send item directive', () => { _id: 'New Stage', name: 'new stage', }; - beforeEach(inject(($q, $compile, $rootScope, api, editor) => { + beforeEach(inject(($q, $compile, $rootScope, api) => { spyOn(api, 'find').and.returnValue($q.when({})); spyOn(api, 'save').and.returnValue($q.when({task: {desk: 'new', stage: 'new'}})); diff --git a/scripts/apps/authoring/views/article-edit.html b/scripts/apps/authoring/views/article-edit.html index 107680b724..acc9df5d7e 100644 --- a/scripts/apps/authoring/views/article-edit.html +++ b/scripts/apps/authoring/views/article-edit.html @@ -16,33 +16,7 @@
- - - - - - -
-
- -
- - - - -
-
-
- -
-
- - - - - -
-
-
-
-
- - - - -
-
{{item.description_text}}
-
- -
- -
-
-
- -
@@ -870,7 +750,7 @@
- -
- -
-
-
diff --git a/scripts/core/editor2/add-content.ts b/scripts/core/editor2/add-content.ts deleted file mode 100644 index bd6739e095..0000000000 --- a/scripts/core/editor2/add-content.ts +++ /dev/null @@ -1,146 +0,0 @@ -import {appConfig} from 'appConfig'; - -angular.module('superdesk.apps.editor2.content', []).directive('sdAddContent', ['$window', - function($window) { - return { - // the scope is not isolated because we require the medium instance - controller: AddContentCtrl, - require: ['sdAddContent', '^sdTextEditorBlockText', '^sdTextEditor'], - templateUrl: 'scripts/core/editor2/views/add-content.html', - controllerAs: 'vm', - bindToController: true, - link: function(scope, element, attrs, ctrls) { - var vm = ctrls[0]; - - angular.extend(vm, { - textBlockCtrl: ctrls[1], - sdEditorCtrl: ctrls[2], - }); - if (!vm.config.embeds) { - return; - } - // initialize state - vm.updateState(); - // listen for update state signals - var unbindListener = scope.$parent.$on('sdAddContent::updateState', - (signal, event, editorElem) => { - vm.updateState(event, editorElem); - }); - // update on resize - - angular.element($window).on('resize', vm.updateState); - scope.$on('$destroy', () => { - angular.element($window).off('resize', vm.updateState); - unbindListener(); - }); - }, - }; - }]); - -AddContentCtrl.$inject = ['$scope', '$element', 'superdesk', 'editor', '$timeout', '$q']; -function AddContentCtrl(scope, element, superdesk, editor, $timeout, $q) { - var elementHolder = element.find('div:first-child').first(); - var self = this; - - /** Return true if the event come from this directive's element */ - function elementContainsEventTarget(event) { - if (!angular.isDefined(event)) { - return false; - } - return $.contains(element.get(0), event.target); - } - - angular.extend(self, { - expanded: false, - config: angular.extend({embeds: true}, appConfig.editor || {}), // should be on by default - // update the (+) vertical position on the left and his visibility (hidden/shown) - updateState: function(event, editorElem) { - // hide if medium is not defined yett (can happen at initialization) or - // hide if the text input is not selected and if it was not a click on the (+) button - if (!angular.isDefined(scope.medium) - || !angular.element(editorElem).is(':focus') && !elementContainsEventTarget(event)) { - return self.hide(); - } - - var currentParagraph; - - try { - currentParagraph = angular.element(scope.medium.getSelectedParentElement()); - } catch (e) { - return; - } - var position = currentParagraph.position().top; - // move the (+) button at the caret position - - elementHolder.css('top', position > 0 ? position : 0); - // handle resize: Do nothing, only positioning was needed - if (event && event.type === 'resize') { - return; - } - - const isFocusEvent = event && event.type === 'focus'; - const isClickEvent = event && event.type === 'click'; - const containsTarget = elementContainsEventTarget(event) && currentParagraph.text() === ''; - const isFocused = editorElem.is(':focus') && currentParagraph.text() === ''; - const isEmptyLine = currentParagraph.text() === ''; - const shouldShow = isFocusEvent && containsTarget || isClickEvent && isFocused || isEmptyLine; - - return shouldShow ? self.show() : self.hide(); - }, - hide: function() { - $timeout(() => { - elementHolder.css({ - display: 'none', - }); - self.expanded = false; - }); - }, - show: function() { - $timeout(() => { - elementHolder.css({ - display: 'block', - }); - }); - }, - toogleExpand: function() { - self.expanded = !self.expanded; - }, - isSomethingInClipboard: function() { - return angular.isDefined(self.sdEditorCtrl.getCutBlock()); - }, - triggerAction: function(action) { - self.hide(); - self.actions[action](); - }, - actions: { - addEmbed: function() { - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl).then(() => { - // show the add-embed form - self.textBlockCtrl.block.showAndFocusLowerAddAnEmbedBox(); - }); - }, - addPicture: function() { - superdesk.intent('upload', 'media', {uniqueUpload: true}).then((images) => { - $q.all(images.map((image) => editor.generateMediaTag(image).then((imgTag) => ({ - blockType: 'embed', - embedType: 'Image', - body: imgTag, - caption: image.description_text, - association: image, - })))).then((renderedImages) => { - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl, renderedImages); - }); - }, () => { - scope.node.focus(); - self.textBlockCtrl.restoreSelection(); - }); - }, - pasteBlock: function() { - if (!self.sdEditorCtrl.getCutBlock()) { - return false; - } - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl, self.sdEditorCtrl.getCutBlock(true)); - }, - }, - }); -} diff --git a/scripts/core/editor2/add-embed.ctrl.ts b/scripts/core/editor2/add-embed.ctrl.ts deleted file mode 100644 index 27b94711b8..0000000000 --- a/scripts/core/editor2/add-embed.ctrl.ts +++ /dev/null @@ -1,133 +0,0 @@ -import embedCodeHandlers from './embedCodeHandlers'; - -angular.module('superdesk.apps.editor2.embed', []).controller('SdAddEmbedController', SdAddEmbedController); - -SdAddEmbedController.$inject = ['embedService', '$element', '$timeout', '$q', 'lodash', - 'EMBED_PROVIDERS', '$scope', 'editor', '$injector']; -function SdAddEmbedController(embedService, $element, $timeout, $q, _, - EMBED_PROVIDERS, $scope, editor, $injector) { - var self = this; - - angular.extend(self, { - editorCtrl: undefined, // defined in link method - previewLoading: false, - toggle: function(close) { - // use parameter or toggle - self.extended = angular.isDefined(close) ? !close : !self.extended; - }, - retrieveEmbed: function() { - function retrieveEmbedFromUrl() { - return embedService.get(self.input).then((data) => { - var embed = data.html; - - if (!angular.isDefined(embed)) { - if (data.type === 'link') { - embed = editor.generateLinkTag({ - url: data.url, - title: data.meta.title, - description: data.meta.description, - illustration: data.thumbnail_url, - }); - } else { - embed = editor.generateMediaTag({url: data.url, altText: data.description}); - } - } - return $q.when(embed).then((embedElement) => ({ - body: embedElement, - provider: data.provider_name || EMBED_PROVIDERS.custom, - })); - }); - } - function parseRawEmbedCode() { - var waitFor = []; - var embedBlock = { - body: self.input, - provider: EMBED_PROVIDERS.custom, - }; - - function updateEmbedBlock(partialUpdate) { - angular.extend(embedBlock, partialUpdate); - } - // try to guess the provider of the custom embed - for (var i = 0; i < embedCodeHandlers.length; i++) { - var provider = $injector.invoke(embedCodeHandlers[i]); - - if (angular.isDefined(provider.condition)) { - if (!provider.condition()) { - continue; - } - } - var match = provider.pattern.exec(self.input); - - if (match) { - updateEmbedBlock({provider: provider.name}); - if (provider.callback) { - waitFor.push(provider.callback(match).then(updateEmbedBlock)); - } - break; - } - } - return $q.all(waitFor).then(() => embedBlock); - } - var embedCode; - // if it's an url, use embedService to retrieve the embed code - - if (_.startsWith(self.input, 'http')) { - embedCode = retrieveEmbedFromUrl(); - // otherwise we use the content of the field directly - } else { - embedCode = parseRawEmbedCode(); - } - return $q.when(embedCode); - }, - updatePreview: function() { - self.previewLoading = true; - self.retrieveEmbed().then((embed) => { - angular.element($element) - .find('.preview') - .html(embed.body.replace('\\n', '')); - self.previewLoading = false; - }); - }, - createFigureBlock: function(data) { - // create a new block containing the embed - data.blockType = 'embed'; - return self.editorCtrl.insertNewBlock(self.addToPosition, data); - }, - createBlockFromEmbed: function() { - self.retrieveEmbed().then((embed) => { - self.createFigureBlock({ - embedType: embed.provider, - body: embed.body, - association: embed.association, - }); - // close the addEmbed form - self.toggle(true); - }); - }, - closeEmbed: function() { - // put block back together on embed form close. - self.toggle(); - }, - }); - - // toggle when the `extended` directive attribute changes - $scope.$watch(() => self.extended, (extended, wasExtended) => { - // on enter, focus on input - if (angular.isDefined(extended)) { - if (extended) { - $timeout(() => { - angular.element($element) - .find('input') - .focus(); - }, 500, false); // positive timeout because of a chrome issue - // on leave, clear field - } else if (wasExtended) { - self.input = ''; - if (typeof self.onClose === 'function') { - $timeout(self.onClose); - } - } - } - }); -} diff --git a/scripts/core/editor2/customAnchor.ts b/scripts/core/editor2/customAnchor.ts deleted file mode 100644 index ad0533322c..0000000000 --- a/scripts/core/editor2/customAnchor.ts +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This module extends (and overrides) MediumEditor's anchor button to disallow - * malformed URLs when the 'linkValidation: true' option is set. - * - * It additionally introduces the possibility to set the validation pattern - * using the 'pattern' option when configuring the editor. - */ -import MediumEditor from 'medium-editor'; - -class CustomAnchorButton extends MediumEditor.extensions.anchor { - linkValidation: any; - pattern: any; - getForm: any; - - createForm() { - let form = super.createForm(); - - if (!this.linkValidation) { - return form; - } - - let input = form.getElementsByTagName('input')[0]; - - input.setAttribute('type', 'url'); - input.setAttribute('required', ''); - if (this.pattern) { - input.setAttribute('pattern', this.pattern); - } - - return form; - } - - doFormSave() { - let input = this.getForm().getElementsByTagName('input')[0]; - - // prevent double encoding; medium editor don't detect if the url is already encoded - input.value = decodeURIComponent(input.value); - - let isValid = input.checkValidity(); - - if (isValid) { - super.doFormSave(); - } - } -} - -// override default anchor -MediumEditor.extensions.anchor = CustomAnchorButton; diff --git a/scripts/core/editor2/editor.ctrl.ts b/scripts/core/editor2/editor.ctrl.ts deleted file mode 100644 index 6e8cd03149..0000000000 --- a/scripts/core/editor2/editor.ctrl.ts +++ /dev/null @@ -1,401 +0,0 @@ -import {appConfig} from 'appConfig'; - -angular.module('superdesk.apps.editor2.ctrl', []).controller('SdTextEditorController', SdTextEditorController); - -SdTextEditorController.$inject = ['lodash', 'EMBED_PROVIDERS', '$timeout', 'editor', '$q']; -function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, $q) { - var self = this; - - function Block(attrs: any = {}) { - // eslint-disable-next-line consistent-this - var BlockFnThis = this; - - angular.extend(BlockFnThis, _.defaults({ - body: attrs.body, - loading: attrs.loading, - caption: attrs.caption, - blockType: attrs.blockType, - embedType: attrs.embedType, - association: attrs.association, - lowerAddEmbedIsExtended: undefined, - showAndFocusLowerAddAnEmbedBox: function() { - BlockFnThis.lowerAddEmbedIsExtended = true; - }, - }, { - body: '


', - loading: false, - blockType: 'text', - })); - } - /** - * For the given blocks, merge text blocks when there are following each other - * and add empty text block arround embeds if needed - */ - function prepareBlocks(blocks) { - var newBlocks = []; - - blocks.forEach((block, i) => { - // if not the first block and there is a text block following another one - if (i > 0 && block.blockType === 'text' && blocks[i - 1].blockType === 'text') { - // we merge the content with the previous block - newBlocks[newBlocks.length - 1].body += block.body; - } else { - // otherwise we add the full block - newBlocks.push(block); - } - // add emtpy text block if block is between 2 embed blocks or at the end - if (blocks[i].blockType === 'embed') { - if (i === blocks.length - 1 || blocks[i + 1].blockType === 'embed') { - newBlocks.push(new Block()); - } - } - }); - // add emtpy text block at the top if needed - if (newBlocks[0].blockType === 'embed') { - newBlocks.unshift(new Block()); - } - return newBlocks; - } - function splitIntoBlock(bodyHtml) { - var blocks = [], block; - /** - * push the current block into the blocks collection if it is not empty - */ - - function commitBlock() { - if (block !== undefined && block.body.trim() !== '') { - blocks.push(block); - block = undefined; - } - } - - function handleParagraph(element) { - commitBlock(); - if (angular.isDefined(element.innerHTML) && element.textContent !== '' - && element.textContent !== '\n') { - blocks.push(new Block({body: element.outerHTML.trim()})); - } - } - - $('
' + bodyHtml + '
') - .contents() - .toArray() - .forEach((element) => { - // if we get a

, we push the current block and create a new one - // for the paragraph content - if (element.nodeName === 'P') { - handleParagraph(element); - // detect if it's an embed - } else if (element.nodeName === '#comment') { - if (element.nodeValue.indexOf('EMBED START') > -1) { - commitBlock(); - // retrieve the embed type following the comment - var embedType; - var embedTypeRegex = /EMBED START ([\w-]+)/; - var match; - - if ((match = embedTypeRegex.exec(angular.copy(element.nodeValue).trim())) !== null) { - embedType = match[1]; - } else { - embedType = EMBED_PROVIDERS.custom; - } - // retrieve the association reference - var association; - var embedAssoKey = /{id: "(embedded\d+)"}/; - - if ((match = embedAssoKey.exec(angular.copy(element.nodeValue).trim())) !== null - && self.associations) { - association = angular.copy(self.associations[match[1]]); - } - // create the embed block - block = new Block({ - blockType: 'embed', - embedType: embedType, - association: association, - body: '', - }); - } - if (element.nodeValue.indexOf('EMBED END') > -1) { - commitBlock(); - } - // if it's not a paragraph or an embed, we update the current block - } else { - if (block === undefined) { - block = new Block({body: ''}); - } - // we want the outerHTML (ex: 'text') or the node value for text and comment - block.body += (element.outerHTML || element.nodeValue || '').trim(); - } - }); - // at the end of the loop, we push the last current block - if (block !== undefined && block.body.trim() !== '') { - blocks.push(block); - } - // Complete embeds with metadata (from association datadata or html) - blocks.forEach((blockObject) => { - if (blockObject.blockType === 'embed') { - // for images that come from Superdesk, we use the association - if (blockObject.association && blockObject.embedType === 'Image') { - blockObject.caption = blockObject.association.description_text; - blockObject.body = ''; - editor.generateMediaTag(blockObject.association).then((img) => { - blockObject.body = img; - }); - } else { - // extract body and caption from embed blockObject html - var originalBody = angular.element(angular.copy(blockObject.body)); - - if (originalBody.get(0).nodeName === 'FIGURE') { - blockObject.body = ''; - originalBody.contents() - .toArray() - .forEach((element) => { - if (element.nodeName === 'FIGCAPTION') { - blockObject.caption = element.innerHTML; - } else { - blockObject.body += element.outerHTML || element.nodeValue || ''; - } - }); - } - } - } - }); - // if no block, create an empty one to start - if (blocks.length === 0) { - blocks.push(new Block()); - } - return blocks; - } - angular.extend(self, { - configuration: angular.extend({embeds: true}, appConfig.editor || {}), - blocks: [], - initEditorWithOneBlock: function(model) { - self.model = model; - self.blocks = [new Block({body: model.$modelValue})]; - }, - initEditorWithMultipleBlock: function(model) { - // save the model to update it later - self.model = model; - // parse the given model and create blocks per paragraph and embed - var content = model.$modelValue || ''; - // update the actual blocks value at the end to prevent more digest cycle as needed - - self.blocks = splitIntoBlock(content); - self.renderBlocks(); - }, - serializeBlock: function(blocks = self.blocks) { - // in case blocks are not ready - if (blocks.length === 0) { - return ''; - } - var newBody = ''; - - if (self.config.multiBlockEdition) { - blocks.forEach((block) => { - if (angular.isDefined(block.body) && block.body.trim() !== '') { - if (block.blockType === 'embed') { - var blockName = block.embedType.trim(); - // add an id to the image in order to retrieve it in `assocations` field - - if (block.association) { - blockName += ' {id: "embedded' + self.generateBlockId(block) + '"}'; - } - newBody += [ - '\n', - '

', - block.body, - '
', - block.caption, - '
', - '
', - '\n\n'].join(''); - } else { - newBody += block.body + '\n'; - } - } - }); - } else { - newBody = blocks.length > 0 && typeof blocks[0].body === 'string' ? blocks[0].body : ''; - } - // strip
and

- newBody = newBody.trim().replace(/


<\/p>$/, ''); - newBody = newBody.replace(/
$/, ''); - return newBody; - }, - commitChanges: function() { - var associations = angular.copy(self.associations); - // initialize associations if doesn't exist - - if (typeof associations !== 'object') { - associations = {}; - } - // remove older associations - angular.forEach(associations, (value, key) => { - if (_.startsWith(key, 'embedded')) { - associations[key] = null; - } - }); - - if (Object.keys(associations).length || self.associations) { - // update associations with the ones stored in blocks - self.associations = angular.extend({}, associations, self.getAssociations()); - } - - // save model with latest state of blocks - var serialized = self.serializeBlock(); - - if (serialized !== self.model.$viewValue) { - self.model.$setViewValue(serialized); - } - }, - /** - * Return an object that contains the embedded images in the story - */ - getAssociations: function() { - var association = {}; - - self.blocks.forEach((block) => { - // we keep the association only for Superdesk images - if (block.association) { - // add the association - association['embedded' + self.generateBlockId(block)] = angular.copy(block.association); - } - }); - return association; - }, - getBlockPosition: function(block) { - return _.indexOf(self.blocks, block); - }, - splitAndInsert: function(textBlockCtrl, blocksToInsert) { - // index where to add the new block - var index = self.getBlockPosition(textBlockCtrl.block) + 1; - - if (index === 0) { - throw new Error('Block to split not found'); - } - // cut the text that is after the caret in the block and save it in order to add it after the embed later - var after = textBlockCtrl.extractEndOfBlock().innerHTML; - - return $q.when((function() { - if (after) { - // save the blocks (with removed leading text) - textBlockCtrl.updateModel(); - // add new text block for the remaining text - return self.insertNewBlock(index, { - body: after, - }, true); - } - })()).then(() => { - if (angular.isDefined(blocksToInsert)) { - var isArray = true; - var arrayBlocks = blocksToInsert; - - if (!angular.isArray(arrayBlocks)) { - isArray = false; - arrayBlocks = [arrayBlocks]; - } - var waitFor = $q.when(); - var createdBlocks = []; - - arrayBlocks.forEach((bti) => { - waitFor = waitFor.then(() => { - var newBlock = self.insertNewBlock(index, bti); - - createdBlocks.push(newBlock); - return newBlock; - }); - }); - return waitFor.then(() => { - if (isArray) { - return $q.all(createdBlocks); - } - - return createdBlocks[0]; - }); - } - }); - }, - /** - ** Merge text blocks when there are following each other and add empty text block arround embeds if needed - ** @param {Integer} position - ** @param {Object} block ; block attributes - ** @param {boolean} doNotRenderBlocks ; if true, it won't merge text blocks and - ** add empty text block if needed through the `renderBlocks()` function. - ** @returns {object} this - */ - insertNewBlock: function(position, attrs, doNotRenderBlocks) { - var newBlock = new Block(attrs); - - return $q((resolve) => { - $timeout(() => { - self.blocks.splice(position, 0, newBlock); - $timeout(() => { - self.commitChanges(); - if (!doNotRenderBlocks) { - $timeout(() => { - self.renderBlocks(); - resolve(newBlock); - }, 0, false); - } else { - resolve(newBlock); - } - }, 0, false); - }); - }); - }, - /** - * Merge text blocks when there are following each other and add empty text block arround embeds if needed - */ - renderBlocks: function() { - self.blocks = prepareBlocks(self.blocks); - }, - removeBlock: function(block) { - // remove block only if it's not the only one - var blockPosition = self.getBlockPosition(block); - - if (self.blocks.length > 1) { - self.blocks.splice(blockPosition, 1); - } else { - // if it's the first block, just remove the content - block.body = ''; - } - self.renderBlocks(); - return $timeout(self.commitChanges); - }, - clipboard: undefined, - cutBlock: function(block) { - self.clipboard = angular.copy(block); - return self.removeBlock(block); - }, - getCutBlock: function(remove) { - var block = self.clipboard; - - if (remove) { - self.clipboard = undefined; - } - return block; - }, - /** - * Compute an id for the block with its content and its position. - * Used as `track by` value, it allows the blocks to be well rendered. - */ - generateBlockId: function(block) { - function hashCode(string) { - var hash = 0, i, chr, len; - - if (string.length === 0) { - return hash; - } - for (i = 0, len = string.length; i < len; i++) { - chr = string.charCodeAt(i); - // tslint:disable-next-line:no-bitwise - hash = (hash << 5) - hash + chr; - // tslint:disable-next-line:no-bitwise - hash |= 0; // Convert to 32bit integer - } - return hash; - } - return String(Math.abs(hashCode(block.body))) + String(self.getBlockPosition(block)); - }, - }); -} diff --git a/scripts/core/editor2/editor.spec.ts b/scripts/core/editor2/editor.spec.ts deleted file mode 100644 index 400c9a2806..0000000000 --- a/scripts/core/editor2/editor.spec.ts +++ /dev/null @@ -1,165 +0,0 @@ -import {ISuperdeskGlobalConfig} from 'superdesk-api'; -import {appConfig} from 'appConfig'; - -describe('text editor', () => { - beforeEach(() => { - const testConfig: Partial = { - server: {url: undefined, ws: undefined}, - iframely: {key: '123'}, - }; - - Object.assign(appConfig, testConfig); - }); - - beforeEach(window.module('superdesk.apps.publish')); - beforeEach(window.module('superdesk.config')); - beforeEach(window.module('superdesk.apps.editor2')); - beforeEach(window.module('superdesk.apps.spellcheck')); - beforeEach(window.module('superdesk.apps.vocabularies')); - beforeEach(window.module('superdesk.apps.searchProviders')); - - beforeEach(() => { - // remove all elements from body - document.body = document.createElement('body'); - }); - - function createScope(text, $rootScope) { - var scope = $rootScope.$new(); - - scope.node = document.createElement('p'); - scope.node.innerHTML = text; - scope.model = { - $viewValue: text, - $setViewValue: function(value) { - this.$viewValue = value; - }, - }; - scope.medium = { - exportSelection: function() { - return {start: 0, end: 0}; - }, - importSelection: function(pos) { /* no-op */ }, - }; - document.body.appendChild(scope.node); - - // eslint-disable-next-line jasmine/no-unsafe-spy - spyOn(scope.model, '$setViewValue').and.callThrough(); - return scope; - } - - it('can spellcheck', inject((editor, spellcheck, $q, $rootScope) => { - spyOn(spellcheck, 'errors').and.returnValue($q.when([{word: 'test', index: 0}])); - spyOn(spellcheck, 'getDictionary').and.returnValue($q.when([{language_id: 'en'}])); - - var scope = createScope('test', $rootScope); - - editor.registerScope(scope); - editor.renderScope(scope); - $rootScope.$digest(); - - expect(scope.node.innerHTML).toBe('test'); - expect(scope.node.parentNode.lastChild.innerHTML) - .toBe('test'); - })); - - it('can replace word in node', inject((editor, $q, $rootScope) => { - var content = 'test foo'; - var scope = createScope(content, $rootScope); - - editor.replaceWord(scope, 5, 3, 'bars'); - expect(scope.node.innerHTML).toBe('test bars'); - })); - - it('can findreplace', inject((editor, spellcheck, $q, $rootScope) => { - spyOn(spellcheck, 'errors').and.returnValue($q.when([{word: 'test', index: 0}])); - spyOn(spellcheck, 'getDictionary').and.returnValue($q.when([{language_id: 'en'}])); - - var scope = createScope('test foo and foo', $rootScope); - - editor.registerScope(scope); - - editor.setSettings({findreplace: {diff: {foo: '', bar: ''}}}); - editor.render(); - $rootScope.$digest(); - editor.selectNext(); - - var foo1 = 'foo'; - var foo1active = 'foo'; - var foo2 = 'foo'; - var foo2active = 'foo'; - - expect(scope.node.innerHTML).toBe('test foo and foo'); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1active + ' and ' + foo2); - - editor.selectNext(); - expect(scope.node.innerHTML).toBe('test foo and foo'); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1 + ' and ' + foo2active); - - editor.selectPrev(); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1active + ' and ' + foo2); - - editor.replace('tic'); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('test tic and foo'); - editor.render(); - $rootScope.$digest(); - editor.selectNext(); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test tic and ' + foo2active); - - editor.setSettings({findreplace: {diff: {test: ''}}}); - editor.render(); - $rootScope.$digest(); - editor.replaceAll('bars'); - expect(scope.node.innerHTML).toBe('bars tic and foo'); - - editor.setSettings({findreplace: null}); - editor.render(); - $rootScope.$digest(); - expect(scope.node.parentNode.lastChild.innerHTML).toContain('sderror'); - expect(scope.node.parentNode.lastChild.innerHTML).not.toContain('active'); - expect(scope.node.innerHTML).toBe('bars tic and foo'); - })); - - it('can replace abbreviations', inject((editor, spellcheck, $q, $rootScope, $timeout) => { - editor.setSettings({spellcheck: true}); - var abbreviations = { - IMF: 'International Monetory Fund', - WHO: 'World Health Organisation', - UN: 'United Nations', - }; - - spyOn(spellcheck, 'getAbbreviationsDict').and.returnValue($q.when(abbreviations)); - var scope = createScope('test', $rootScope); - - editor.registerScope(scope); - scope.node.parentNode.classList.add('typing'); - - scope.node.innerHTML = 'foo'; - editor.commit(); - expect(scope.model.$setViewValue).not.toHaveBeenCalled(); - $rootScope.$digest(); - expect(scope.model.$setViewValue).toHaveBeenCalledWith('foo'); - expect(scope.node.innerHTML).toBe('foo'); - - scope.node.innerHTML = 'foo IMF*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo ' + abbreviations.IMF); - - scope.node.innerHTML = 'foo IMF IMF* IMF*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo IMF ' + abbreviations.IMF + ' ' + abbreviations.IMF); - - scope.node.innerHTML = 'foo IMF* WHO*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo ' + abbreviations.IMF + ' ' + abbreviations.WHO); - })); - - it('can check if keyboard event is important or not', inject((editor) => { - expect(editor.shouldIgnore({keyCode: 16})).toBe(true); - expect(editor.shouldIgnore({shiftKey: true, ctrlKey: true, keyCode: 65})).toBe(true); - expect(editor.shouldIgnore({keyCode: 65})).toBe(false); - })); -}); diff --git a/scripts/core/editor2/editor.ts b/scripts/core/editor2/editor.ts deleted file mode 100644 index 0fed26ca7e..0000000000 --- a/scripts/core/editor2/editor.ts +++ /dev/null @@ -1,1771 +0,0 @@ -/** - * This file is part of Superdesk. - * - * Copyright 2013, 2014 Sourcefabric z.u. and contributors. - * - * For the full copyright and license information, please see the - * AUTHORS and LICENSE files distributed with this source code, or - * at https://www.sourcefabric.org/superdesk/license - */ -import MediumEditor from 'medium-editor'; -import MediumEditorTable from 'medium-editor-tables'; -import _ from 'lodash'; -import {get} from 'lodash'; -import {gettext, escapeRegExp} from 'core/utils'; - -import './customAnchor'; -import {appConfig} from 'appConfig'; - -var TYPING_CLASS = 'typing'; - -/** - * History stack - * - * It supports undo/redo operations - * - * @param {string} initialValue - */ -function HistoryStack(initialValue) { - var stack = []; - var index = -1; - - /** - * Add a new value to stack and remove all furhter redo values - * so after manual change there is no way to redo. - * - * @param {string} value - */ - this.add = function(value) { - index = index + 1; - stack[index] = value; - stack.splice(index + 1, stack.length); - }; - - /** - * Select previous value (undo) - */ - this.selectPrev = function() { - index = Math.max(-1, index - 1); - }; - - /** - * Select next value (redo) - */ - this.selectNext = function() { - index = !_.isNil(stack[index + 1]) ? index + 1 : index; - }; - - /** - * Get current value - */ - this.get = function() { - var state = index > -1 ? stack[index] : initialValue; - - return state; - }; - - /** - * Get current index - * - * @return {Number} - */ - this.getIndex = function() { - return index; - }; -} - -EditorService.$inject = ['spellcheck', '$q', 'renditions', 'editorUtils']; -function EditorService(spellcheck, $q, renditionsService, utils) { - this.settings = {spellcheck: true}; - - this.version = () => '2'; - - this.KEY_CODES = Object.freeze({ - Y: 'Y'.charCodeAt(0), - Z: 'Z'.charCodeAt(0), - UP: 38, - DOWN: 40, - F3: 114, - }); - - this.ARROWS = Object.freeze({ - 33: 1, // page up - 34: 1, // page down - 35: 1, // end - 36: 1, // home - 37: 1, // left - 38: 1, // up - 39: 1, // right - 40: 1, // down - }); - - this.META = Object.freeze({ - 16: 1, // shift - 17: 1, // ctrl - 18: 1, // alt - 20: 1, // caps lock - 91: 1, // left meta in webkit - 93: 1, // right meta in webkit - 224: 1, // meta in firefox - }); - - /** - * Test if given keyboard event should be ignored as it's not changing content. - * - * @param {Event} event - * @return {boolen} - */ - this.shouldIgnore = function(event) { - // ignore arrows - if (self.ARROWS[event.keyCode]) { - return true; - } - - // ignore meta keys (ctrl, shift or meta only) - if (self.META[event.keyCode]) { - return true; - } - - // ignore shift + ctrl/meta + something - if (event.shiftKey && (event.ctrlKey || event.metaKey)) { - return true; - } - - return false; - }; - - var ERROR_CLASS = 'sderror'; - var HILITE_CLASS = 'sdhilite'; - var ACTIVE_CLASS = 'sdactive'; - var FINDREPLACE_CLASS = 'sdfindreplace'; - - var self = this; - var scopes = []; - - /** - * Register given scope - it adds history stack to it and keeps reference - * - * @param {Scope} scope - */ - this.registerScope = function(scope) { - scopes.push(scope); - scope.history = new HistoryStack(scope.model.$viewValue || ''); - scope.$on('$destroy', () => { - var index = scopes.indexOf(scope); - - scopes.splice(index, 1); - }); - }; - - /** - * Render highlights for given scope based on settings - * - * @param {Scope} scope - * @param {Scope} force force rendering manually - eg. via keyboard - */ - this.renderScope = function(scope, force, preventStore) { - if (self.settings.findreplace) { - renderFindreplace(scope.node); - } else if (self.settings.spellcheck || force) { - spellcheck.getDictionary(scope.language).then((dictionaries) => { - if (dictionaries && dictionaries.length) { - renderSpellcheck(scope.node, preventStore); - } - }); - } else { - utils.removeHilites(scope.node); - } - }; - - /** - * Render highlights in all registered scopes - * - * @param {Boolean} force rendering - */ - this.render = function(force) { - scopes.forEach((scope) => { - self.renderScope(scope, force); - }); - }; - - /** - * Highlight find&replace matches in given node - * - * @param {Node} node - */ - function renderFindreplace(node) { - var tokens = utils.getFindReplaceTokens(node, self.settings); - - utils.hilite(node, tokens, FINDREPLACE_CLASS); - } - - /** - * Highlight spellcheck errors in given node - * - * @param {Node} node - */ - function renderSpellcheck(node, preventStore) { - spellcheck.errors(node).then((tokens) => { - utils.hilite(node, tokens, ERROR_CLASS, preventStore); - }); - } - - /** - * Set next highlighted node active. - * - * In case there is no node selected select first one. - */ - this.selectNext = function() { - var nodes = document.body.getElementsByClassName(HILITE_CLASS); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes.item(i); - - if (node.classList.contains(ACTIVE_CLASS)) { - node.classList.remove(ACTIVE_CLASS); - var nextNode = nodes.item((i + 1) % nodes.length); - - nextNode.classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - return node; - } - } - - if (nodes.length) { - nodes.item(0).classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - } - }; - - function scrollHighlightedNodeToTop() { - let containerElem = angular.element('.page-content-container'); - - if (containerElem.offset()) { - // This offset is to make visible what the top section of the document will hide when scrolled - let baseOffset = angular.element('.subnav__button-stack').prop('clientHeight') + - angular.element('.authoring-sticky').prop('clientHeight') + - angular.element('#top-menu').prop('clientHeight'); - - let classList = '.' + FINDREPLACE_CLASS + '.' + ACTIVE_CLASS + '.' + HILITE_CLASS; - - let nodeElem = angular.element(classList); - - if (nodeElem.length > 0) { - // All set, scroll to the highlighted element - containerElem.scrollTop(nodeElem.offset().top - containerElem.offset().top + - containerElem.scrollTop() - baseOffset); - } - } - } - - /** - * Set previous highlighted node active. - */ - this.selectPrev = function() { - var nodes = document.body.getElementsByClassName(HILITE_CLASS); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes.item(i); - - if (node.classList.contains(ACTIVE_CLASS)) { - node.classList.remove(ACTIVE_CLASS); - nodes.item(i === 0 ? nodes.length - 1 : i - 1).classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - return; - } - } - }; - - function replaceText(scope, text, className = ACTIVE_CLASS) { - var nodes = scope.node.parentNode.getElementsByClassName(className); - var nodesLength = nodes.length; - var replacementOffset = self.replaceNodes(nodes, text, scope); - - if (replacementOffset && className === ACTIVE_CLASS) { - updateIndexOnReplace(scope.node, replacementOffset); - } - return nodesLength; - } - - // updates the data-index of remaining find-replace candidates subsequent to just replaced active node - function updateIndexOnReplace(node, replacementOffset) { - var nodes = node.parentNode.getElementsByClassName(HILITE_CLASS); - var nextElem, newIndex, activeIndex; - - for (var i = 0; i < nodes.length; i++) { - var currentNode = nodes.item(i); - - if (currentNode.classList.contains(ACTIVE_CLASS)) { - currentNode.classList.remove(FINDREPLACE_CLASS); - activeIndex = i; - } - } - - if (!_.isNil(activeIndex)) { - for (var j = activeIndex + 1; j < nodes.length; j++) { - nextElem = nodes.item(j); - newIndex = parseInt(nextElem.getAttribute('data-index'), 10) + replacementOffset; - nextElem.setAttribute('data-index', newIndex); - } - } - } - - /** - * Replace active node with given text. - * - * @param {string} text - */ - this.replace = function(text) { - scopes.forEach((scope) => { - if (replaceText(scope, text)) { - this.commitScope(scope); - } - }); - }; - - /** - * Replace all highlighted nodes with given text. - * - * @param {string} text - */ - this.replaceAll = function(text) { - scopes.forEach((scope) => { - var nodes = scope.node.parentNode.getElementsByClassName(HILITE_CLASS); - - this.replaceNodes(nodes, text, scope); - this.commitScope(scope); - }); - }; - - /** - * Replace text at given index with word - * - * @param {Object} scope - * @param {Number} index - * @param {Number} length - * @param {String} word - */ - this.replaceWord = function(scope, index, length, word) { - var node = scope.node; - var start = utils.findWordNode(node, index, length); - var characters = start.node.textContent.split(''); - - characters.splice(start.offset, length, word); - start.node.textContent = characters.join(''); - }; - - /** - * Replace all nodes with text - * - * @param {HTMLCollection} nodes - * @param {string} text - */ - this.replaceNodes = function(nodes, text, scope) { - var index, replacementOffset = 0; - - for (var i = 0, l = nodes.length; i < l; i++) { - var node = nodes.item(i); - var word = node.dataset.word; - - index = parseInt(node.dataset.index, 10) + replacementOffset; - this.replaceWord(scope, index, word.length, text); - replacementOffset += text.length - word.length; - } - return replacementOffset; - }; - - /** - * Update settings - * - * @param {Object} settings - */ - this.setSettings = function(settings) { - self.settings = angular.extend({}, self.settings, settings); - }; - - /** - * Test if given elem is a spellcheck error node - * - * @param {Node} elem - * @return {boolean} - */ - this.isErrorNode = function(elem) { - return elem.classList.contains(ERROR_CLASS); - }; - - /** - * Commit changes in all scopes - */ - this.commit = function() { - scopes.forEach(self.commitScope); - }; - - /** - * Replace abbreviations. - * @param {Scope} scope - */ - function replaceAbbreviations(scope) { - if (!scope.node.parentNode.classList.contains(TYPING_CLASS)) { - return $q.when({}); - } - - if (scope.node.innerText !== '') { - return spellcheck.getAbbreviationsDict().then((abbreviations) => { - if (_.keys(abbreviations).length) { - var pattern = '\\b(' - + _.map(_.keys(abbreviations), (item) => escapeRegExp(item)).join('|') + ')(\\*)'; - var found = scope.node.innerText.match(new RegExp(pattern, 'g')); - - if (found) { - // store old settings - var oldSettings = angular.extend({}, self.settings); - var caretPosition = scope.medium.exportSelection(); - - _.forEach(_.uniq(found), (val: string) => { - var replacementValue = abbreviations[val.replace('*', '')]; - - if (replacementValue) { - var diff = {}; - - diff[val] = replacementValue; - self.setSettings({findreplace: {diff: diff, caseSensitive: true}}); - renderFindreplace(scope.node); - var nodesLength = replaceText(scope, replacementValue, FINDREPLACE_CLASS); - - if (nodesLength > 0) { - var incrementCaretPosition = (replacementValue.length - val.length) * nodesLength; - - caretPosition.start += incrementCaretPosition; - caretPosition.end += incrementCaretPosition; - } - } - }); - - scope.medium.importSelection(caretPosition); - // apply old settings - self.setSettings({findreplace: oldSettings.findreplace ? oldSettings.findreplace : null}); - } - } - }); - } - - return $q.when({}); - } - - /** - * Commit changes in given scope to its model - * - * @param {Scope} scope - */ - this.commitScope = function(scope) { - replaceAbbreviations(scope).then(() => { - var nodeValue = scope.node.innerHTML; - - if (nodeValue !== scope.model.$viewValue) { - scope.model.$setViewValue(nodeValue); - scope.history.add(scope.model.$viewValue); - } - }); - }; - - /** - * Returns the cleaned node text - * - * @return {string} - */ - this.getNodeText = function(scope) { - return scope.node.innerHTML; - }; - - /** - * Get active node text - * - * @return {string} - */ - this.getActiveText = function() { - var active; - - scopes.forEach((scope) => { - var nodes = scope.node.parentNode.getElementsByClassName(ACTIVE_CLASS); - - active = nodes.length ? nodes.item(0) : active; - }); - - return active ? active.textContent : null; - }; - - /** - * Return html code to represent an embedded link - * - * @param {string} url - * @param {string} titleg - * @param {string} description - * @param {string} illustration - * @return {string} html - */ - this.generateLinkTag = ({url, title, description, illustration}) => [ - '

', - angular.isDefined(illustration) ? - ' ' : '', - '
', - ' ' + title + '', - '
', - angular.isDefined(description) ? - '
' + description + '
' : '', - '
', - ].join('\n'); - - this.generateMediaTag = function(data) { - var mediaTypes: any = { - video: function() { - var videoTag = [''); - return videoTag.join(''); - }, - picture: function() { - var url = data.url, altText = data.altText; - var promiseFinished; - // if this is a SD archive, we use its properties - - if (data._type === 'archive' || data.type === 'picture' || data.type === 'graphic') { - // get expected renditions list - promiseFinished = renditionsService.get().then((renditionsList) => { - // ]use the first rendtion as default - var firstRendition = data.renditions[renditionsList[0].name]; - - if (angular.isDefined(firstRendition)) { - url = firstRendition.href; - } else { - // use "viewImage" rendition as fallback - url = data.renditions.viewImage.href; - } - // if a `alt_text` exists, otherwise we fill w/ `description_text` - altText = data.alt_text || data.description_text; - return renditionsList; - }); - } - // when previous promise is finished, compose the html - return $q.when(promiseFinished, (renditionsList) => { - var html = [' { - if (r.width) { - var rendition = data.renditions[r.name]; - - if (angular.isDefined(rendition)) { - renditionsHtml.push(rendition.href.replace('http://', '//') - + ' ' + rendition.width + 'w'); - } - } - }); - if (renditionsHtml.length > 0) { - html.push('srcset="' + renditionsHtml.join(', ') + '"'); - } - } - html.push('/>'); - return html.join(' '); - }); - }, - }; - - mediaTypes.graphic = mediaTypes.picture; - return $q.when(mediaTypes[data.type]()); - }; - - this.getSelectedText = function() { - var text = ''; - - if (window.getSelection) { - text = window.getSelection().toString(); - } else if (document['selection'] && document['selection'].type !== 'Control') { - text = document['selection'].createRange().text; - } - return text; - }; -} - -SdTextEditorBlockEmbedController.$inject = ['$timeout', 'editor', 'renditions']; -function SdTextEditorBlockEmbedController($timeout, editor, renditions) { - var self = this; - - angular.extend(self, { - embedCode: undefined, // defined below - caption: undefined, // defined below - title: undefined, // defined below - editable: false, - toggleEdition: function() { - self.editable = !self.editable; - }, - saveEmbedCode: function() { - // update the block's model - angular.extend(self.model, { - body: self.embedCode, - }); - // on change callback - self.onBlockChange(); - }, - cancel: function() { - self.embedCode = self.model.body; - }, - saveCaption: function(caption, title) { - // if block is a superdesk image (with association), we update the description_text and headline - if (self.model.association) { - self.model.association.description_text = caption; - self.model.association.headline = title; - } - // update the caption in the model - self.model.caption = caption; - self.model.title = title; - - // update the caption in the view - self.caption = caption; - self.title = title; - - // on change callback - $timeout(() => { - self.onBlockChange(); - }); - }, - handlePaste: function(e) { - e.preventDefault(); - e.stopPropagation(); - - var clipboardData = e.originalEvent.clipboardData || window.clipboardData; - var pastedData = clipboardData.getData('Text'); - - $timeout(() => { - document.execCommand('insertHTML', false, pastedData); - }); - }, - isEditable: function(picture) { - return picture._type !== 'externalsource'; - }, - editPicture: function(picture) { - // only for SD images (with association) - if (!self.model.association) { - return false; - } - self.model.loading = true; - renditions.crop(picture).then((croppedPicture) => { - // update block - self.model.association = croppedPicture; - editor.generateMediaTag(croppedPicture).then((img) => { - self.model.body = img; - }); - // update caption - self.saveCaption(self.model.association.description_text, self.model.association.headline); - }) - .finally(() => { - self.model.loading = false; - }); - }, - }); - $timeout(() => { - angular.extend(self, { - embedCode: self.model.body, - caption: self.model.caption, - - // model.association has no value when embed source is not superdesk - title: get(self, 'model.association.headline', ''), - }); - }); -} - -angular.module('superdesk.apps.editor2', [ - 'superdesk.apps.editor2.ctrl', - 'superdesk.apps.editor2.embed', - 'superdesk.apps.editor2.content', - 'superdesk.apps.editor2.utils', - 'superdesk.apps.spellcheck', - 'superdesk.apps.authoring', - 'angular-embed', -]) - .service('editor', EditorService) - .constant('EMBED_PROVIDERS', { // see http://noembed.com/#supported-sites - custom: 'Custom', - twitter: 'Twitter', - youtube: 'YouTube', - vidible: 'Vidible', - }) - .directive('sdAddEmbed', ['$timeout', function($timeout) { - return { - scope: {addToPosition: '=', extended: '=', onClose: '&'}, - require: ['sdAddEmbed', '^sdTextEditor'], - templateUrl: 'scripts/core/editor2/views/add-embed.html', - controllerAs: 'vm', - controller: 'SdAddEmbedController', - bindToController: true, - link: function(scope, element, attrs, controllers) { - var vm = controllers[0]; - - angular.extend(vm, { - editorCtrl: controllers[1], - }); - // listen to the escape touch to close the field when pressed - element.bind('keyup', (e) => { - if (e.keyCode === 27) { // escape - $timeout(() => { - vm.extended = false; - }); - } - }); - }, - }; - }]) - .directive('sdTextEditorDropZone', ['embedService', 'EMBED_PROVIDERS', 'editor', '$timeout', '$q', - (embedService, EMBED_PROVIDERS, editor, $timeout, $q) => { - var dragOverClass = 'medium-editor-dragover'; - - return { - require: '^sdTextEditorBlockText', - scope: {sdTextEditorDropZone: '@'}, - link: function(scope, element, attrs, ctrl) { - if (scope.sdTextEditorDropZone === 'false') { - return; - } - - var MEDIA_TYPES = [ - 'application/superdesk.item.picture', - 'application/superdesk.item.graphic', - 'application/superdesk.item.video', - 'application/superdesk.item.audio', - 'text/html', - ]; - - let getType = (event) => MEDIA_TYPES.find( - (_type) => event.originalEvent.dataTransfer.types.indexOf(_type) >= 0, - ); - - element.on('drop dragdrop', (event) => { - event.preventDefault(); - event.stopPropagation(); - const mediaType = getType(event); - const paragraph = angular.element(event.target); - - let item = event.originalEvent.dataTransfer.getData(mediaType); - - // we want to ensure that the field is empty before inserting something - if (paragraph.text() !== '') { - return false; - } - // remove the UI state - paragraph.removeClass(dragOverClass); - // select paragraph element in order to register position - ctrl.selectElement(paragraph.get(0)); - // assume this is an item in json format when it comes from superdesk - if (mediaType.indexOf('application/superdesk') === 0) { - item = angular.fromJson(item); - // insert the item - ctrl.insertMedia(item); - } else if (mediaType === 'text/html' && typeof item === 'string') { - $q.when((() => { - // if it's a link (...), create an embed by using iframely - // if not, create an embed based on the item content - const urlMatch = //.exec(item); - - if (urlMatch) { - return embedService.get(urlMatch[1]).then((data) => ({ - blockType: 'embed', - embedType: data.provider_name || EMBED_PROVIDERS.custom, - body: data.html || editor.generateLinkTag({ - url: data.url, - title: data.meta.title, - description: data.meta.description, - illustration: data.thumbnail_url, - }), - })); - } - return { - blockType: 'embed', - embedType: EMBED_PROVIDERS.custom, - body: item, - }; - })()) - // split the current block and insert the new block, then commit changes - .then((block) => { - ctrl.sdEditorCtrl.splitAndInsert(ctrl, block) - .then(() => $timeout(ctrl.sdEditorCtrl.commitChanges)); - }); - } - }) - .on('dragover', (event) => { - const paragraph = angular.element(event.target); - - let matching = getType(event); - - if (matching) { - // allow to overwite the drop binder (see above) - event.preventDefault(); - event.stopPropagation(); - // if dragged element is a picture and if the paragraph is empty, - // highlight the paragraph - if (paragraph.text() === '') { - return paragraph.addClass(dragOverClass); - } - } - // otherwise, remove the style - paragraph.removeClass(dragOverClass); - }) - .on('dragleave', (event) => { - const paragraph = angular.element(event.target); - - paragraph.removeClass(dragOverClass); - }); - }, - }; - }]) - .directive('sdTextEditor', ['$timeout', function($timeout) { - return { - scope: {type: '=', config: '=', editorformat: '=', language: '=', associations: '=?', readOnly: '=?'}, - require: ['sdTextEditor', 'ngModel'], - templateUrl: 'scripts/core/editor2/views/editor.html', - controllerAs: 'vm', - controller: 'SdTextEditorController', - bindToController: true, - link: function(scope, element, attr, controllers) { - var controller = controllers[0]; - var ngModel = controllers[1]; - - window.dispatchEvent(new CustomEvent('editorInitialized')); - - function init() { - scope.$applyAsync(() => { - if (controller.config.multiBlockEdition) { - controller.initEditorWithMultipleBlock(ngModel); - } else { - controller.initEditorWithOneBlock(ngModel); - } - }); - } - // init editor based on model - init(); - // when the model changes from outside, updates the editor - scope.$watch(function outsideModelChange() { - return ngModel.$viewValue; - }, () => { - $timeout(() => { - // if controller is ready and the value has changed - if (controller.blocks.length > 0 && ngModel.$viewValue !== controller.serializeBlock()) { - // if blocks are not loading - if (!_.some(controller.blocks, (block) => block.loading)) { - init(); - } - } - }, 250, false); - }); - }, - }; - }]) - .directive('sdTextEditorBlockEmbed', () => - ({ - scope: {type: '=', config: '=', language: '=', model: '=sdTextEditorBlockEmbed', onBlockChange: '&'}, - templateUrl: 'scripts/core/editor2/views/block-embed.html', - controllerAs: 'vm', - bindToController: true, - controller: SdTextEditorBlockEmbedController, - }), - ) - .directive('sdTextEditorBlockText', ['editor', 'spellcheck', '$timeout', - '$q', '$rootScope', - function(editor, spellcheck, $timeout, $q, $rootScope) { - var TOP_OFFSET = 134; // header height - - var EDITOR_CONFIG = { - toolbar: { - static: true, - align: 'left', - sticky: true, - stickyTopOffset: TOP_OFFSET, - updateOnEmptySelection: true, - }, - paste: { - // Both are disabled because it overwrites the `ctrl`+`v` binding - // and we need it for the block paste feature - forcePlainText: false, - cleanPastedHTML: false, - // SDESK-714 chrome will replace

by

. This line reverts it (SDESK-714) - cleanReplacements: [[new RegExp(//gi), '

'], [new RegExp(/<\/div>/gi), '

']], - }, - anchor: { - placeholderText: gettext('Paste or type a full link'), - linkValidation: true, - }, - anchorPreview: { - showWhenToolbarIsVisible: true, - }, - placeholder: false, - disableReturn: false, - spellcheck: false, - targetBlank: true, - }; - - if (appConfig.editor) { - angular.extend(EDITOR_CONFIG, appConfig.editor); - } - - /** - * Get number of lines for all p nodes before given node withing same parent. - */ - function getLinesBeforeNode(p) { - function getLineCount(text) { - return text.split('\n').length; - } - - var lines = 0; - var pos = p; - - while (pos) { - if (pos.childNodes.length && pos.childNodes[0].nodeType === Node.TEXT_NODE) { - lines += getLineCount(pos.childNodes[0].wholeText); - } else if (pos.childNodes.length) { - lines += 1; // empty paragraph - } - pos = pos.previousSibling; - } - - return lines; - } - - /** - * Get line/column coordinates for given cursor position. - */ - function getLineColumn() { - var column, lines, - selection = window.getSelection(); - - if (selection.anchorNode.nodeType === Node.TEXT_NODE) { - var text = selection.anchorNode['wholeText'].substring(0, selection.anchorOffset); - var node = selection.anchorNode; - - column = text.length + 1; - while (node.nodeName !== 'P') { - if (node.previousSibling) { - column += node.previousSibling['wholeText'] ? - node.previousSibling['wholeText'].length : - node.previousSibling.textContent.length; - node = node.previousSibling; - } else { - node = node.parentNode; - } - } - - lines = 0 + getLinesBeforeNode(node); - } else { - lines = 0 + getLinesBeforeNode(selection.anchorNode); - column = 1; - } - - return { - line: lines, - column: column, - }; - } - - function extractBlockContentsFromCaret() { - function getBlockContainer(node) { - var pos = node; - - while (pos) { - if (pos.nodeType === 1 && /^(DIV)$/i.test(pos.nodeName)) { - return pos; - } - pos = pos.parentNode; - } - } - var sel = window.getSelection(); - - if (sel.rangeCount) { - var selRange = sel.getRangeAt(0); - var blockEl = getBlockContainer(selRange.endContainer); - - if (blockEl) { - var range = selRange.cloneRange(); - - range.selectNodeContents(blockEl); - range.setStart(selRange.endContainer, selRange.endOffset); - var remaining = range.extractContents(); - var $blockEl = $(blockEl); - // clear if empty of text - - if ($blockEl.text() === '') { - $blockEl.html(''); - } - // remove empty last line - $blockEl.find('p:last').each(function() { - if ($(this).text() === '') { - this.remove(); - } - }); - return remaining; - } - } - } - - function setEditorFormatOptions(editorConfig, editorFormat, scope) { - function addButton(format) { - editorConfig.toolbar.buttons.push({ - h1: { - name: 'h1', - action: 'append-h2', - aria: gettext('header type 1'), - tagNames: ['h2'], - contentDefault: '' + gettext('H1') + '', - classList: ['custom-class-h1'], - attrs: { - 'data-custom-attr': 'attr-value-h1', - }, - }, - - h2: { - name: 'h2', - action: 'append-h3', - aria: gettext('header type 2'), - tagNames: ['h3'], - contentDefault: '' + gettext('H2') + '', - classList: ['custom-class-h2'], - attrs: { - 'data-custom-attr': 'attr-value-h2', - }, - }, - - bold: { - name: 'bold', - action: 'bold', - aria: gettext('bold'), - tagNames: ['b'], - contentDefault: '' + gettext('B') + '', - }, - - underline: { - name: 'underline', - action: 'underline', - aria: gettext('underline'), - tagNames: ['u'], - }, - - italic: { - name: 'italic', - action: 'italic', - aria: gettext('italic'), - tagNames: ['i'], - contentDefault: '' + gettext('I') + '', - }, - - quote: { - name: 'quote', - action: 'append-blockquote', - aria: gettext('quote'), - }, - - removeFormat: { - name: 'removeFormat', - action: 'removeFormat', - aria: gettext('remove formatting'), - }, - - link: { - name: 'anchor', - action: 'createLink', - aria: gettext('link'), - }, - }[format] || format); - } - - _.each(editorFormat, addButton); - } - - return { - scope: {type: '=', config: '=', language: '=', sdTextEditorBlockText: '=', readOnly: '=?'}, - require: ['ngModel', '^sdTextEditor', 'sdTextEditorBlockText'], - templateUrl: 'scripts/core/editor2/views/block-text.html', - link: function(scope, elem, attrs, controllers) { - var ngModel = controllers[0]; - var sdTextEditor = controllers[1]; - - scope.model = ngModel; - // give the block model and the editor controller to the text block controller - var vm = controllers[2]; - - angular.extend(vm, { - block: scope.sdTextEditorBlockText, - sdEditorCtrl: sdTextEditor, - }); - vm.block = scope.sdTextEditorBlockText; - var editorElem; - var updateTimeout; - var renderTimeout; - - ngModel.$viewChangeListeners.push(changeListener); - ngModel.$render = function() { - editor.registerScope(scope); - var editorConfig = angular.merge( - {}, - EDITOR_CONFIG, scope.config || {}, - {disableEditing: scope.readOnly}, - ); - - if (editorConfig.toolbar) { - editorConfig.toolbar.buttons = []; - setEditorFormatOptions(editorConfig, sdTextEditor.editorformat, scope); - // if config.multiBlockEdition is true, add Embed and Image button to the toolbar - if (scope.config.multiBlockEdition) { - // this dummy imageDragging stop preventing drag & drop events - editorConfig.extensions = {imageDragging: {}}; - if (editorConfig.toolbar.buttons.indexOf('table') !== -1 - && angular.isDefined(MediumEditorTable)) { - editorConfig.extensions.table = new MediumEditorTable({ - aria: gettext('insert table'), - }); - } - } - } - - spellcheck.setLanguage(scope.language); - editorElem = elem.find(scope.type === 'preformatted' ? '.editor-type-text' - : '.editor-type-html'); - // events could be attached already, so remove these - editorElem.off('mouseup keydown keyup click contextmenu'); - editorElem.empty(); - editorElem.html(ngModel.$viewValue || ''); - scope.node = editorElem[0]; - scope.model = ngModel; - // destroy exiting instance - if (scope.medium) { - scope.medium.destroy(); - } - - // create a new instance of the medium editor binded to this node - scope.medium = new MediumEditor(scope.node, editorConfig); - // restore the selection if exist - if (scope.sdTextEditorBlockText.caretPosition) { - scope.node.focus(); - vm.restoreSelection(); - // clear the saved position - scope.sdTextEditorBlockText.caretPosition = undefined; - } - // listen for paste event and insert a block if exists in clipboard - scope.medium.subscribe('editablePaste', (e) => { - var clipboard = vm.sdEditorCtrl.getCutBlock(true); - - if (clipboard) { - e.preventDefault(); - vm.sdEditorCtrl.splitAndInsert(vm, clipboard); - } - }); - // listen caret moves in order to show or hide the (+) button beside the caret - function updateAddContentButton(e) { - scope.$emit('sdAddContent::updateState', e, editorElem); - } - editorElem.on('mouseup', updateAddContentButton); - ['editableInput', 'focus', 'blur', 'editableClick', 'editableKeyup'] - .forEach((eventName) => { - scope.medium.subscribe(eventName, updateAddContentButton); - }); - // listen updates by medium editor to update the model - scope.medium.subscribe('editableInput', (e, element) => { - element.querySelectorAll('span[style]').forEach((span) => { - span.before(span.firstChild); - span.remove(); - }); - - cancelTimeout(); - updateTimeout = $timeout(vm.updateModel, 200, false); - }); - scope.medium.subscribe('blur', () => { - // save latest know caret position - vm.savePosition(); - - vm.updateModel(); - }); - // update the toolbar, bc it can be displayed at the - // wrong place if offset of block has changed - scope.medium.subscribe('focus', () => { - var toolbar = scope.medium.getExtensionByName('toolbar'); - - if (toolbar) { - toolbar.positionStaticToolbar(scope.medium.getFocusedElement()); - } - }); - - // hide toolbar if element is under header - scope.medium.subscribe('positionedToolbar', (e, element) => { - var toolbar = scope.medium.getExtensionByName('toolbar'), - elemPosition = element.getBoundingClientRect(); - - if (toolbar) { - toolbar.toolbar.hidden = elemPosition.top + elemPosition.height < TOP_OFFSET; - } - }); - - function cancelTimeout(event?) { - $timeout.cancel(updateTimeout); - startTyping(); - } - - function changeSelectedParagraph(direction) { - var selectedParagraph = angular.element(scope.medium.getSelectedParentElement()); - var paragraphToBeSelected = selectedParagraph[direction > 0 ? 'next' : 'prev']('p'); - - if (paragraphToBeSelected.length > 0) { - // select the paragraph - scope.medium.selectElement(paragraphToBeSelected.get(0)); - // scroll to the paragraph - var $scrollableParent = $('.page-content-container'); - var offset = $scrollableParent.scrollTop(); - - offset += paragraphToBeSelected.position().top; - offset += paragraphToBeSelected.closest('.block__container').offset().top; - offset -= 100; // margin to prevent the top bar to hide the selected paragraph - $scrollableParent.scrollTop(offset); - } - } - - function toggleCase() { - var selectedText = editor.getSelectedText(); - - if (selectedText.length > 0) { - // looks the first character, and inverse the case of the all selection - if (selectedText[0].toUpperCase() === selectedText[0]) { - selectedText = selectedText.toLowerCase(); - } else { - selectedText = selectedText.toUpperCase(); - } - scope.medium.saveSelection(); - // replace the selected text - scope.medium.cleanPaste(selectedText); - scope.medium.restoreSelection(); - } - } - - var ctrlOperations = {}, shiftOperations = {}; - - ctrlOperations[editor.KEY_CODES.UP] = changeSelectedParagraph.bind(null, -1); - ctrlOperations[editor.KEY_CODES.DOWN] = changeSelectedParagraph.bind(null, 1); - shiftOperations[editor.KEY_CODES.F3] = toggleCase; - editorElem.on('keydown', (event) => { - if (editor.shouldIgnore(event)) { - return; - } - // prevent default behaviour for ctrl or shift operations - if (event.ctrlKey && ctrlOperations[event.keyCode] || - event.shiftKey && shiftOperations[event.keyCode]) { - event.preventDefault(); - } - cancelTimeout(event); - }); - editorElem.on('keyup', (event) => { - if (editor.shouldIgnore(event)) { - return; - } - if (event.ctrlKey && ctrlOperations[event.keyCode]) { - ctrlOperations[event.keyCode](); - return; - } - if (event.shiftKey && shiftOperations[event.keyCode]) { - shiftOperations[event.keyCode](); - return; - } - cancelTimeout(event); - updateTimeout = $timeout(vm.updateModel, 200, false); - }); - - /** - * Test if given point {x, y} is in given bouding rectangle. - */ - function isPointInRect(point, rect) { - return rect.left < point.x && rect.right > point.x && rect.top < point.y - && rect.bottom > point.y; - } - - editorElem.on('contextmenu', (event) => { - var err, pos; - var point = {x: event.clientX, y: event.clientY}; - var errors = elem[0].parentNode.getElementsByClassName('sderror'); - - for (var i = 0, l = errors.length; i < l; i++) { - err = errors.item(i); - pos = err.getBoundingClientRect(); - if (isPointInRect(point, pos)) { - event.preventDefault(); - event.stopPropagation(); - renderContextMenu(err); - return false; - } - } - }); - - function renderContextMenu(node) { - // close previous menu (if any) - scope.$apply(() => { - scope.suggestions = null; - scope.openDropdown = false; - }); - - // set data needed for replacing - scope.replaceWord = node.dataset.word; - scope.replaceIndex = parseInt(node.dataset.index, 10); - scope.sentenceWord = node.dataset.sentenceWord === 'true'; - - spellcheck.suggest(node.textContent).then((suggestions) => { - if (scope.sentenceWord) { - suggestions.push({ - key: scope.replaceWord[0].toUpperCase() + scope.replaceWord.slice(1), - value: scope.replaceWord[0].toUpperCase() + scope.replaceWord.slice(1), - }); - - scope.suggestions = suggestions.filter((suggestion) => - suggestion.key !== scope.replaceWord, - ); - } else { - scope.suggestions = suggestions; - } - scope.replaceTarget = node; - scope.$applyAsync(() => { - var menu = elem[0].getElementsByClassName('dropdown__menu')[0]; - - menu.style.left = node.offsetLeft + 'px'; - menu.style.top = node.offsetTop + node.offsetHeight + 'px'; - menu.style.position = 'absolute'; - scope.openDropdown = true; - }); - }); - return false; - } - - if (scope.type === 'preformatted') { - editorElem.on('keydown keyup click', () => { - scope.$apply(() => { - angular.extend(scope.cursor, getLineColumn()); - }); - }); - } - - scope.$on('$destroy', () => { - scope.medium.destroy(); - editorElem.off(); - }); - scope.cursor = {}; - render(null, null, true); - }; - - scope.removeBlock = function() { - sdTextEditor.removeBlock(scope.sdTextEditorBlockText); - }; - - scope.$on('spellcheck:run', render); - scope.$on('key:ctrl:shift:s', render); - - function render($event, event, preventStore) { - if (!$rootScope.config.features || !$rootScope.config.features.useTansaProofing) { - stopTyping(); - editor.renderScope(scope, $event, preventStore); - if (event) { - event.preventDefault(); - } - } - } - - scope.replace = function(text) { - editor.replaceWord(scope, scope.replaceIndex, scope.replaceWord.length, text); - editor.commitScope(scope); - }; - - scope.addWordToDictionary = function() { - var word = scope.replaceTarget.textContent; - - spellcheck.addWordToUserDictionary(word); - editor.render(); - }; - - scope.ignoreWord = function() { - var word = scope.replaceTarget.textContent; - - spellcheck.ignoreWord(word); - editor.render(); - }; - - function changeListener() { - $timeout.cancel(renderTimeout); - renderTimeout = $timeout(render, 0, false); - } - - function startTyping() { - scope.node.parentNode.classList.add(TYPING_CLASS); - } - - function stopTyping() { - scope.node.parentNode.classList.remove(TYPING_CLASS); - } - }, - controller: ['$scope', 'api', 'superdesk', 'renditions', 'send', - function(scope, api, superdesk, renditions, send) { - var self = this; - - angular.extend(self, { - block: undefined, // provided in link method - sdEditorCtrl: undefined, // provided in link method - selectElement: function(element) { - scope.medium.selectElement(element); - // save position - self.savePosition(); - }, - restoreSelection: function() { - scope.medium.importSelection(self.block.caretPosition); - // put the caret at end of the selection - scope.medium.options.ownerDocument.getSelection().collapseToEnd(); - }, - savePosition: function() { - self.block.caretPosition = scope.medium.exportSelection(); - }, - extractEndOfBlock: function() { - // it can happen that user lost the focus on the block when this fct in called - // so we restore the latest known position - self.restoreSelection(); - // extract the text after the cursor - var remainingElementsContainer = document.createElement('div'); - - remainingElementsContainer.appendChild(extractBlockContentsFromCaret().cloneNode(true)); - // remove the first line if empty - $(remainingElementsContainer).find('p:first') - .each(function() { - if ($(this).text() === '') { - this.remove(); - } - }); - return remainingElementsContainer; - }, - updateModel: function() { - editor.commitScope(scope); - }, - insertMedia: function(media) { - const validItems = send.getValidItems([media]); - - if (validItems.length > 0) { - var mediaType = { - picture: 'Image', - graphic: 'Image', - video: 'Video', - }; - var imageBlock = { - blockType: 'embed', - embedType: mediaType[media.type], - caption: media.description_text, - loading: true, - association: media, - }; - - self.sdEditorCtrl.splitAndInsert(self, imageBlock).then((block) => { - // load the media and update the block - $q.when((function() { - if ( - appConfig.features != null - && appConfig.features.editFeaturedImage != null - && !appConfig.features.editFeaturedImage - && media._type === 'externalsource' - ) { - return media; - } - return renditions.ingest(media); - })()).then((mediaObject) => { - editor.generateMediaTag(mediaObject).then((imgTag) => { - angular.extend(block, { - body: imgTag, - association: mediaObject, - loading: false, - }); - $timeout(self.sdEditorCtrl.commitChanges); - }); - }); - }); - } - }, - }); - }], - }; - }]) - .run(['embedService', 'iframelyService', function(embedService, iframelyService) { - // eslint-disable-next-line no-useless-escape - var playBuzzPattern = 'https?:\/\/(?:www)\.playbuzz\.com(.*)$'; - var playBuzzlLoader = '//snappa.embed.pressassociation.io/playbuzz.js'; - var playBuzzEmbed = [ - '', - '
', - ].join(''); - - embedService.registerHandler({ - name: 'PlayBuzz', - patterns: [playBuzzPattern], - embed: function(url) { - return iframelyService.embed(url) - .then((result) => { - result.html = playBuzzEmbed - .replace('$_LOADER', playBuzzlLoader) - .replace('$_URL', url.match(playBuzzPattern)[1]); - return result; - }); - }, - }); - var samdeskEmbed = [ - '', - '
', - ].join(''); - var samDeskPattern = 'https?://embed.samdesk.io/(?:embed|preview)/(.+)'; - - embedService.registerHandler({ - name: 'SAMDesk', - patterns: [samDeskPattern], - embed: function(url) { - var embed = samdeskEmbed.replace('$_ID', url.match(samDeskPattern)[1]); - - return { - provider_name: 'SAMDesk', - html: embed, - url: url, - type: 'rich', - }; - }, - }); - }]) - .config(['embedServiceProvider', 'iframelyServiceProvider', - function(embedServiceProvider, iframelyServiceProvider) { - iframelyServiceProvider.setKey(appConfig.iframely.key); - // don't use noembed as first choice - embedServiceProvider.setConfig('useOnlyFallback', true); - // iframely respect the original embed for more services than 'embedly' - embedServiceProvider.setConfig('fallbackService', 'iframely'); - }]); - -function EditorUtilsFactory() { - var CLONE_CLASS = 'clone'; - var HILITE_CLASS = 'sdhilite'; - var ACTIVE_CLASS = 'sdactive'; - var FINDREPLACE_CLASS = 'sdfindreplace'; - - /** - * Function for sorting array of strings from longest to shortest - * - * @param {string} a - * @param {string} b - * @return {number} - */ - function reverseLengthSort(a, b) { - return b.length - a.length; - } - - /** - * Find text node within given node for given character offset - * - * This will find text node within given node that contains character on given offset - * - * @param {Node} node - * @param {numeric} offset - * @return {Object} {node: {Node}, offset: {numeric}} - */ - function findOffsetNode(node, offset) { - var tree = document.createTreeWalker(node, NodeFilter.SHOW_TEXT); - var currentLength; - var currentOffset = 0; - var ZERO_WIDTH_SPACE = String.fromCharCode(65279); - - while (tree.nextNode()) { - tree.currentNode.textContent = tree.currentNode.textContent.replace(ZERO_WIDTH_SPACE, ''); - currentLength = tree.currentNode.textContent.length; - if (currentOffset + currentLength >= offset) { - return {node: tree.currentNode, offset: offset - currentOffset}; - } - - currentOffset += currentLength; - } - } - - return { - - /** - * Find all matches for current find&replace needle in given node - * - * Each match is {word: {string}, offset: {number}} in given node, - * we can't return nodes here because those will change when we start - * highlighting and offsets wouldn't match - * - * @param {Node} node - * @param {Object} settings - * @return {Array} list of matches - */ - getFindReplaceTokens: function(node, settings) { - var tokens = []; - var diff = settings.findreplace.diff || {}; - var pattern = Object.keys(diff) - .sort(reverseLengthSort) - .map(escapeRegExp) - .join('|'); - - if (!pattern) { - return tokens; - } - - var flags = settings.findreplace.caseSensitive ? 'm' : 'im'; - var re = new RegExp(pattern, flags); - var nodeOffset = 0; - var text, match, offset; - var isActive, elementClone, elementFindReplace; - - elementClone = node.parentNode.getElementsByClassName(CLONE_CLASS); - - if (elementClone && elementClone.length) { - elementFindReplace = elementClone.item(0).getElementsByClassName(FINDREPLACE_CLASS); - } - - function isTokenActive(index) { - var active, matched; - - if (elementFindReplace && elementFindReplace.length) { - matched = _.filter(elementFindReplace, - (elem) => parseInt(elem.getAttribute('data-index'), 10) === index); - - active = matched && matched.length ? matched[0].classList.contains(ACTIVE_CLASS) : false; - } - return active; - } - - var tree = document.createTreeWalker(node, NodeFilter.SHOW_TEXT); - - while (tree.nextNode()) { - text = tree.currentNode.textContent; - - while (!_.isNil(match = text.match(re))) { - isActive = isTokenActive(nodeOffset + match.index); - - tokens.push({ - word: match[0], - index: nodeOffset + match.index, - title: diff[match[0]] || '', - active: isActive, - }); - - offset = match.index + match[0].length; - text = text.substr(offset); - nodeOffset += offset; - } - nodeOffset += text.length; - } - - return tokens; - }, - - /** - * Hilite all tokens within node using span with given className - * - * This first stores caret position, updates markup, and then restores the caret. - * - * @param {Node} node - * @param {Array} tokens - * @param {string} className - * @param {Boolean} preventStore - */ - hilite: function(node, tokens, className, preventStore) { - // remove old hilites - this.removeHilites(node); - - // create a clone - var hiliteNode = node.cloneNode(true); - - hiliteNode.classList.add(CLONE_CLASS); - - // generate hilite markup in clone - tokens.forEach((token) => { - this.hiliteToken(hiliteNode, token, className); - }); - - // render clone - node.parentNode.appendChild(hiliteNode); - }, - - /** - * Highlight single `token` via putting it into a span with given class - * - * @param {Node} node - * @param {Object} token - * @param {string} className - */ - hiliteToken: function(node, token, className) { - var start = this.findWordNode(node, token.index, token.word.length); - var replace = start.node.splitText(start.offset); - var span = document.createElement('span'); - - span.classList.add(className); - span.classList.add(HILITE_CLASS); - - if (token.active) { - span.classList.add(ACTIVE_CLASS); - } - - replace.splitText(token.word.length); - span.textContent = replace.textContent; - span.dataset.word = token.word; - span.dataset.index = token.index; - if (token.sentenceWord) { - span.dataset.sentenceWord = 'true'; - span.classList.add('sdCapitalize'); - } - replace.parentNode.replaceChild(span, replace); - }, - - /** - * Remove hilites node from nodes parent - * - * @param {Node} node - */ - removeHilites: function(node) { - var parentNode = node.parentNode; - var clones = parentNode.getElementsByClassName(CLONE_CLASS); - - if (clones.length) { - parentNode.removeChild(clones.item(0)); - } - }, - - /** - * Find text node within given node where word is located - * - * It will find text type node where the whole word is located - * - * @param {Node} node - * @param {Number} index - * @param {Number} length - * @return {Object} {node: {Node}, offset: {Number}} - */ - findWordNode: function(node, index, length) { - var start = findOffsetNode(node, index); - var end = findOffsetNode(node, index + length); - - // correction for linebreaks - first node on a new line is set to - // linebreak text node which is not even visible in dom, maybe dom bug? - if (start.node !== end.node) { - start.node = end.node; - start.offset = 0; - } - - return start; - }, - }; -} - -angular.module('superdesk.apps.editor2.utils', []) - .factory('editorUtils', EditorUtilsFactory); diff --git a/scripts/core/editor2/embedCodeHandlers.spec.ts b/scripts/core/editor2/embedCodeHandlers.spec.ts deleted file mode 100644 index efad3f1a7b..0000000000 --- a/scripts/core/editor2/embedCodeHandlers.spec.ts +++ /dev/null @@ -1,107 +0,0 @@ -import {ISuperdeskGlobalConfig} from 'superdesk-api'; -import {appConfig} from 'appConfig'; - -describe('Embed Code Handlers', () => { - var ctrl, scope; - - beforeEach(() => { - const testConfig: Partial = { - server: {url: undefined, ws: undefined}, - iframely: {key: '123'}, - editor: {}, - }; - - Object.assign(appConfig, testConfig); - }); - - beforeEach(window.module('superdesk.apps.editor2')); - beforeEach(window.module('superdesk.apps.vocabularies')); - beforeEach(window.module('superdesk.apps.searchProviders')); - - beforeEach(inject(($controller, $rootScope) => { - var element = angular.element('
'); - - scope = $rootScope.$new(); - ctrl = $controller('SdAddEmbedController', {$scope: scope, $element: element}); - })); - - it('match a twitter url', inject(($rootScope, $q, $httpBackend, embedService) => { - ctrl.input = 'https://twitter.com/letzi83/status/764062125996113921'; - jasmine.createSpy(embedService, 'get').and.returnValue($q.when({ - meta: {site: 'Twitter'}, - html: 'embed', - })); - $httpBackend.whenJSONP(/https:\/\/iframe\.ly\/api\/.*/).respond(400); - $httpBackend.whenGET(/https:\/\/iframe\.ly\/api\/.*/).respond(400); - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: 'embed', - provider: 'Twitter', - }); - }); - $rootScope.$digest(); - })); - - it('match a twitter embed', () => { - ctrl.input = '' + - ''; - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Twitter', - }); - }); - scope.$digest(); - }); - - it('match a vidible embed', inject(($httpBackend) => { - ctrl.input = '
' + - '
'; - // retrieve embed with Vidible disabled - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Custom', - }); - }); - scope.$digest(); - - const testConfig: Partial = { - editor: { - ...appConfig.editor, - // retrieve embed with Vidible enabled - vidible: true, - }, - }; - - Object.assign(appConfig, testConfig); - - var apiResponse = { - height: 360, - mimeType: 'video/ogg', - size: 2004079, - type: 'video', - url: 'http://delivery.vidible.tv/video/redirect/56bb4688e4b0b6448ed479dd' + - '?bcid=538612f0e4b00fbb8e898655&w=640&h=360', - width: 640, - }; - - $httpBackend - .expectGET(appConfig.server.url + '/vidible/bcid/538612f0e4b00fbb8e898655/pid/56bb474de4b0568f54a23ed7') - .respond(apiResponse); - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Vidible', - association: apiResponse, - }); - }); - $httpBackend.flush(); - scope.$digest(); - })); -}); diff --git a/scripts/core/editor2/embedCodeHandlers.ts b/scripts/core/editor2/embedCodeHandlers.ts deleted file mode 100644 index 4bdfe6a19c..0000000000 --- a/scripts/core/editor2/embedCodeHandlers.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {appConfig} from 'appConfig'; - -export default [ - ['EMBED_PROVIDERS', function(EMBED_PROVIDERS) { - return { - pattern: /twitter\.com\/widgets\.js/g, - name: EMBED_PROVIDERS.twitter, - }; - }], - ['EMBED_PROVIDERS', function(EMBED_PROVIDERS) { - return { - pattern: /www\.youtube\.com/g, - name: EMBED_PROVIDERS.youtube, - }; - }], - ['EMBED_PROVIDERS', 'api', function(EMBED_PROVIDERS, api) { - return { - pattern: /src=".*vidible\.tv.*pid=(.+)\/(.+).js/g, - name: EMBED_PROVIDERS.vidible, - condition: () => appConfig.editor != null && appConfig.editor.vidible, - callback: (match) => api.get(`vidible/bcid/${match[2]}/pid/${match[1]}`) - .then((data) => ({association: data})), - }; - }], -]; diff --git a/scripts/core/editor2/index.ts b/scripts/core/editor2/index.ts deleted file mode 100644 index 185742c738..0000000000 --- a/scripts/core/editor2/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @ngdoc module - * @module superdesk.core.editor2 - * @name superdesk.core.editor2 - * @packageName superdesk.core - * @description Superdesk core editor version 2. - */ -import './styles/editor.scss'; - -import './editor'; -import './editor.ctrl'; -import './add-embed.ctrl'; -import './add-content'; diff --git a/scripts/core/editor2/styles/editor.scss b/scripts/core/editor2/styles/editor.scss deleted file mode 100644 index 2a8c51ad10..0000000000 --- a/scripts/core/editor2/styles/editor.scss +++ /dev/null @@ -1,245 +0,0 @@ -@import '~variables.scss'; -@import '~mixins.scss'; -@import "~sf-additional.scss"; - -.editor-type-html { - &:before{ - display: block; /* For Firefox */ - } - &:empty:before{ - content: attr(placeholder); - pointer-events: none; - display: block; /* For Firefox */ - color: rgba(150, 150, 150, 0.5) - } - &:focus:before{ - display: none; - } - // prevent chrome to add extra markup with style in contenteditable - span, p, h1, h2, h3, h4 { - background-color: transparent; - font-family: inherit; - } - - span, h3 { - font-size: inherit; - line-height: 150%; - } - - pre { - font-size: inherit; - line-height: 150%; - - span, h3 { - font-size: inherit; - line-height: 150%; - } - } -} - -.headline { - .editor-type-html { - span { - font-size: inherit; - line-height: 120%; - font-weight: 500; - } - } -} - -.dropdown__menu--suggestions { - font-size: 14px; - font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif; -} - -.medium-editor-toolbar { - z-index: 1020; - // disabled state for toolbar button - li .medium-editor-button-disabled { - background-color: gray; - cursor: default; - pointer-events: none; - } -} -.block { - // hide text field on mouse out when empty if not alone - &--not-alone-and-empty { - .text-editor:not(.medium-editor-dragover) { - opacity: 0; - @include transition(opacity .25s); - &:focus, &:hover { - opacity: 1; - } - } - } - &__container { - position: relative; - .text-editor { - padding: 0; - // leave the space for the `add-embed` when the toolbar is shown - margin-top: 6px; - &.medium-editor-dragover, & .medium-editor-dragover { - background: $sd-hover; - border: 2px dashed $sd-blue; - } - } - .preview--caption, .editor--caption { - margin: 0; - border: 1px solid rgba(150, 150, 150, 0.15); - input, select, textarea { - color: inherit; - } - } - .editor--caption [contenteditable] { - padding: 8px; - min-height: 18px; - } - .editor--embed { - min-height: 200px; - } - } - &__actions { - position: absolute; - right: -38px; - top: 0; - cursor: pointer; - opacity: .1; - i { - color: inherit; - } - & > div { - display: inline-block; - } - } - // shows actions on hover - &__container:hover .block__actions {opacity: 1;} -} -.add-content { // (+) button - position: absolute; - z-index: 1; - // translate the button by its dimension - transform: translate(-48px, -12px); - -moz-transform: translate(-48px, -12px); - -wekit-transform: translate(-48px, -12px); - &--expanded { - .add-content__plus-btn { - opacity: 1; - i {transform: rotate(45deg);} - } - .add-content__actions span { - transform: scale(1); - &:hover { - z-index: 1; // for sd-tooltip - } - } - } - &__plus-btn { - position: absolute; - opacity: .7; - &:hover { - opacity: 1; - } - i { - @include transition(transform .25s); - } - } - &__actions { - position: relative; - top: 10px; - left: 50px; - &.ng-hide:not(.ng-hide-animate) { - display: block !important; - position: absolute; - pointer-events: none; - width: 200px; // ensure that inner inline-block is inlined - } - span { - display: inline-block; - transform: scale(0); - @include transition(transform .25s); - &:nth-of-type(2) { - transition-delay: .1s; - -moz-transition-delay: .1s; - -webkit-transition-delay: .1s; - } - border-radius: 24px; - border: 2px solid $sd-blue; - padding: 5px 5px 0px; - background-color: $white; - i {color: $sd-blue;} - &:hover { - cursor: pointer; - background-color: $sd-blue; - i {color: $white;} - } - } - } -} -.add-embed { - &__body { - margin: 10px 0; - padding: 10px; - border: 1px solid $sd-blue; - @include border-radius(3px); - form { - position: relative; - } - } - &__input { - // leave place for action buttons on the sides - margin-right: 100px; - } - // action buttons - &__actions { - // align right - position: absolute; - top: 0; - right: 0; - // centers icons - i { - left: 2px; - position: relative; - } - } -} - -// Embed previews -.block__container .preview--embed, -.add-embed__body .preview { - &--loading { - min-height: 100px; - img { - opacity: .3; - } - &:before { - content: ''; - position: absolute; - top: 50%; - transform: translateY(-50%); - left: 0; - @include spinner-big; - } - } - text-align: center; - margin: 10px 0 0; - .instagram-media { - margin: auto !important; - } - iframe, video { - max-width: 100%; - } - img { - max-width: 100%; - height: auto; - &:hover { - cursor: pointer; - } - } - .embed--link { - &__title { - font-size: 1.75em; - line-height: 1.25em; - margin-bottom: .50em; - } - } -} diff --git a/scripts/core/editor2/views/add-content.html b/scripts/core/editor2/views/add-content.html deleted file mode 100644 index 6fb90bde61..0000000000 --- a/scripts/core/editor2/views/add-content.html +++ /dev/null @@ -1,25 +0,0 @@ -
- -
- - - - - - - - - -
-
diff --git a/scripts/core/editor2/views/add-embed.html b/scripts/core/editor2/views/add-embed.html deleted file mode 100644 index 03cc4c1cc6..0000000000 --- a/scripts/core/editor2/views/add-embed.html +++ /dev/null @@ -1,21 +0,0 @@ -
-
-
- -
-
- - -
-
{{:: 'loading' | translate }} ...
-
-
-
diff --git a/scripts/core/editor2/views/block-embed.html b/scripts/core/editor2/views/block-embed.html deleted file mode 100644 index 3c4c3229f7..0000000000 --- a/scripts/core/editor2/views/block-embed.html +++ /dev/null @@ -1,37 +0,0 @@ -
- - Cancel - Save -
-
-
-
- - -
-
- - -
diff --git a/scripts/core/editor2/views/block-text.html b/scripts/core/editor2/views/block-text.html deleted file mode 100644 index 12bdcd99ad..0000000000 --- a/scripts/core/editor2/views/block-text.html +++ /dev/null @@ -1,29 +0,0 @@ -
- - 
-
- -
-
- - Line: {{cursor.line}}, Column: {{cursor.column}} - - -
    -
    • -
    • -
  • -
    • -
    • -
-
diff --git a/scripts/core/editor2/views/editor.html b/scripts/core/editor2/views/editor.html deleted file mode 100644 index 5ea50f5dea..0000000000 --- a/scripts/core/editor2/views/editor.html +++ /dev/null @@ -1,45 +0,0 @@ -
- -
-
- -
-
- -
-
- - - - -
-
-
-
-
-
- - - -
diff --git a/scripts/core/editor3/index.ts b/scripts/core/editor3/index.ts index 2108cf11b0..7e4a8e7039 100644 --- a/scripts/core/editor3/index.ts +++ b/scripts/core/editor3/index.ts @@ -2,9 +2,6 @@ import './styles.scss'; import {EditorService} from './service'; import {sdEditor3} from './directive'; -import ng from 'core/services/ng'; -import {appConfig} from 'appConfig'; - /** * @ngdoc module * @module superdesk.core.editor3 @@ -14,14 +11,9 @@ import {appConfig} from 'appConfig'; */ export default angular.module('superdesk.core.editor3', ['superdesk.apps.spellcheck']) .service('editor3', EditorService) - .service('editorResolver', ['editor', 'editor3', function(editor2, editor3) { - // Enables the use of editor2 and editor3 in parallel. - // Resolves to old editor in case editor3 is inactive. + .service('editorResolver', ['editor3', function(editor3) { this.get = function() { - const authoring = ng.get('authoring'); - const editor3Active = authoring.editor && authoring.editor.body_html && authoring.editor.body_html.editor3; - - return appConfig.features.onlyEditor3 || editor3Active ? editor3 : editor2; + return editor3; }; }]) .directive('sdEditor3', sdEditor3); diff --git a/scripts/core/editor3/service.ts b/scripts/core/editor3/service.ts index 12e01b2aa1..34623b45f2 100644 --- a/scripts/core/editor3/service.ts +++ b/scripts/core/editor3/service.ts @@ -26,8 +26,7 @@ const spellcheckerStores = []; * @module superdesk.core.editor3 * @name editor3 * @description editor3 is the service that allows interacting with the editor from - * the outside. It uses the same interface as the editor service of core/editor2/editor.js - * to allow plugging one or the other based on the editor of the item being edited. + * the outside. */ export class EditorService { /** diff --git a/scripts/core/index.ts b/scripts/core/index.ts index 6d6353f140..ada8c3f6c3 100644 --- a/scripts/core/index.ts +++ b/scripts/core/index.ts @@ -13,7 +13,6 @@ import 'core/elastic'; import 'core/filters'; import 'core/services'; import 'core/directives'; -import 'core/editor2'; import 'core/spellcheck'; import 'core/editor3'; import 'core/features'; diff --git a/scripts/core/spellcheck/spellcheck.spec.ts b/scripts/core/spellcheck/spellcheck.spec.ts index 0b90131f81..caeec2c0e7 100644 --- a/scripts/core/spellcheck/spellcheck.spec.ts +++ b/scripts/core/spellcheck/spellcheck.spec.ts @@ -31,7 +31,6 @@ describe('spellcheck', () => { Object.assign(appConfig, testConfig); }); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.core.editor3')); beforeEach(window.module('superdesk.apps.spellcheck')); beforeEach(window.module('superdesk.core.preferences')); diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 4946c26720..921549e1e1 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -1925,7 +1925,6 @@ declare module 'superdesk-api' { hideRoutedDesks?: any; autorefreshContent?: any; elasticHighlight?: any; - onlyEditor3?: any; nestedItemsInOutputStage?: boolean; keepMetaTermsOpenedOnClick?: boolean; showCharacterLimit?: number; diff --git a/scripts/index.ts b/scripts/index.ts index c1224f5834..28ef2748ef 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -6,8 +6,6 @@ import 'app.scss'; // styles import 'jquery-jcrop/css/jquery.Jcrop.css'; import 'jquery-ui/themes/smoothness/jquery-ui.css'; -import 'medium-editor/dist/css/medium-editor.css'; -import 'medium-editor-tables/dist/css/medium-editor-tables.css'; import 'owl.carousel/dist/assets/owl.carousel.min.css'; import 'superdesk-ui-framework/dist/superdesk-ui.bundle.css'; diff --git a/scripts/vendor.ts b/scripts/vendor.ts index 48a3fbfd6f..152b8aabe0 100644 --- a/scripts/vendor.ts +++ b/scripts/vendor.ts @@ -8,8 +8,6 @@ import 'angular'; import 'angular-resource'; import 'angular-route'; import 'angular-gettext'; -import 'angular-embedly'; -import 'angular-embed'; import 'angular-contenteditable'; import 'angular-vs-repeat'; import 'angular-moment'; diff --git a/styles/sass/app.scss b/styles/sass/app.scss index 8ac5be71ab..d46d3694c0 100644 --- a/styles/sass/app.scss +++ b/styles/sass/app.scss @@ -52,7 +52,6 @@ // Components: Misc @import 'labels'; -@import 'medium-editor'; // custom skin for medium-editor @import 'sf-additional'; @import 'sf-icons'; @import 'search-list'; diff --git a/styles/sass/medium-editor.scss b/styles/sass/medium-editor.scss deleted file mode 100644 index 85a5b34a5b..0000000000 --- a/styles/sass/medium-editor.scss +++ /dev/null @@ -1,274 +0,0 @@ -@-webkit-keyframes medium-editor-image-loading { - 0% { - -webkit-transform: scale(0); - transform: scale(0); } - 100% { - -webkit-transform: scale(1); - transform: scale(1); } } - -@keyframes medium-editor-image-loading { - 0% { - -webkit-transform: scale(0); - transform: scale(0); } - 100% { - -webkit-transform: scale(1); - transform: scale(1); } } - -@-webkit-keyframes medium-editor-pop-upwards { - 0% { - opacity: 0; - -webkit-transform: matrix(0.97, 0, 0, 1, 0, 12); - transform: matrix(0.97, 0, 0, 1, 0, 12); } - 20% { - opacity: .7; - -webkit-transform: matrix(0.99, 0, 0, 1, 0, 2); - transform: matrix(0.99, 0, 0, 1, 0, 2); } - 40% { - opacity: 1; - -webkit-transform: matrix(1, 0, 0, 1, 0, -1); - transform: matrix(1, 0, 0, 1, 0, -1); } - 100% { - -webkit-transform: matrix(1, 0, 0, 1, 0, 0); - transform: matrix(1, 0, 0, 1, 0, 0); } } - -@keyframes medium-editor-pop-upwards { - 0% { - opacity: 0; - -webkit-transform: matrix(0.97, 0, 0, 1, 0, 12); - transform: matrix(0.97, 0, 0, 1, 0, 12); } - 20% { - opacity: .7; - -webkit-transform: matrix(0.99, 0, 0, 1, 0, 2); - transform: matrix(0.99, 0, 0, 1, 0, 2); } - 40% { - opacity: 1; - -webkit-transform: matrix(1, 0, 0, 1, 0, -1); - transform: matrix(1, 0, 0, 1, 0, -1); } - 100% { - -webkit-transform: matrix(1, 0, 0, 1, 0, 0); - transform: matrix(1, 0, 0, 1, 0, 0); } } - -.medium-editor-anchor-preview { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 16px; - left: 0; - line-height: 1.4; - max-width: 280px; - position: absolute; - text-align: center; - top: 0; - word-break: break-all; - word-wrap: break-word; - visibility: hidden; - z-index: 2000; } - .medium-editor-anchor-preview a { - color: $white; - display: inline-block; - margin: 5px 5px 10px; } - -.medium-editor-anchor-preview-active { - visibility: visible; } - -.medium-editor-dragover { - background: #ddd; } - -.medium-editor-image-loading { - -webkit-animation: medium-editor-image-loading 1s infinite ease-in-out; - animation: medium-editor-image-loading 1s infinite ease-in-out; - background-color: #333; - border-radius: 100%; - display: inline-block; - height: 40px; - width: 40px; } - -.medium-editor-placeholder { - position: relative; } - .medium-editor-placeholder:after { - content: attr(data-placeholder) !important; - font-style: italic; - left: 0; - position: absolute; - top: 0; - white-space: pre; - padding: inherit; - margin: inherit; } - -.medium-toolbar-arrow-under:after, .medium-toolbar-arrow-over:before { - border-style: solid; - content: ''; - display: block; - height: 0; - left: 50%; - margin-left: -8px; - position: absolute; - width: 0; } - -.medium-toolbar-arrow-under:after { - border-width: 8px 8px 0 8px; } - -.medium-toolbar-arrow-over:before { - border-width: 0 8px 8px 8px; - top: -8px; } - -.medium-editor-toolbar { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 16px; - left: 0; - position: absolute; - top: 0; - visibility: hidden; - z-index: 9999; } - .medium-editor-toolbar ul { - margin: 0; - padding: 0; } - .medium-editor-toolbar li { - float: left; - list-style: none; - margin: 0; - padding: 0; } - .medium-editor-toolbar li button { - box-sizing: border-box; - cursor: pointer; - display: block; - font-size: 14px; - line-height: 1; - margin: 0; - padding: 15px; - text-decoration: none; } - .medium-editor-toolbar li button:focus { - outline: none; } - .medium-editor-toolbar li .medium-editor-action-underline { - text-decoration: underline; } - .medium-editor-toolbar li .medium-editor-action-pre { - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; - font-size: 12px; - font-weight: 100; - padding: 15px 0; } - -.medium-editor-toolbar-active { - visibility: visible; } - -.medium-editor-sticky-toolbar { - position: fixed; - top: 1px; } - -.medium-editor-relative-toolbar { - position: relative; } - -.medium-editor-toolbar-active.medium-editor-stalker-toolbar { - -webkit-animation: medium-editor-pop-upwards 160ms forwards linear; - animation: medium-editor-pop-upwards 160ms forwards linear; } - -.medium-editor-action-bold { - font-weight: bolder; } - -.medium-editor-action-italic { - font-style: italic; } - -.medium-editor-toolbar-form { - display: none; } - .medium-editor-toolbar-form input, - .medium-editor-toolbar-form a { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } - .medium-editor-toolbar-form .medium-editor-toolbar-form-row { - line-height: 14px; - margin-left: 5px; - padding-bottom: 5px; } - .medium-editor-toolbar-form .medium-editor-toolbar-input, - .medium-editor-toolbar-form label { - border: none; - box-sizing: border-box; - font-size: 14px; - margin: 0; - padding: 6px; - width: 316px; - display: inline-block; } - .medium-editor-toolbar-form .medium-editor-toolbar-input:focus, - .medium-editor-toolbar-form label:focus { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - border: none; - box-shadow: none; - outline: 0; } - .medium-editor-toolbar-form a { - display: inline-block; - font-size: 24px; - font-weight: bolder; - margin: 0 10px; - text-decoration: none; } - -.medium-editor-toolbar-actions:after { - clear: both; - content: ""; - display: table; } - -[data-medium-editor-element] img { - max-width: 100%; } - -[data-medium-editor-element] sub { - vertical-align: sub; } - -[data-medium-editor-element] sup { - vertical-align: super; } - -.medium-editor-hidden { - display: none; } -.medium-toolbar-arrow-under:after { -top: 60px; -border-color: $sd-blue transparent transparent transparent; } - -.medium-toolbar-arrow-over:before { -top: -8px; -border-color: transparent transparent $sd-blue transparent; } - -.medium-editor-toolbar { -background-color: $sd-blue; } -.medium-editor-toolbar li { - padding: 0; } - .medium-editor-toolbar li button { - min-width: 60px; - height: 60px; - border: none; - border-right: 1px solid $sd-background; - background-color: transparent; - color: $white; - -webkit-transition: background-color .2s ease-in, color .2s ease-in; - transition: background-color .2s ease-in, color .2s ease-in; } - .medium-editor-toolbar li button:hover { - background-color: darken($sd-blue, 20%); - color: $white; } - .medium-editor-toolbar li .medium-editor-button-active { - background-color: darken($sd-blue, 30%); - color: $white; } - .medium-editor-toolbar li .medium-editor-button-last { - border-right: none; } - -.medium-editor-toolbar-form .medium-editor-toolbar-input { -height: 60px; -background: $sd-blue; -color: $white; } -.medium-editor-toolbar-form .medium-editor-toolbar-input::-webkit-input-placeholder { - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input:-moz-placeholder { - /* Firefox 18- */ - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input::-moz-placeholder { - /* Firefox 19+ */ - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input:-ms-input-placeholder { - color: $white; - color: rgba(255, 255, 255, 0.8); } - -.medium-editor-toolbar-form a { -color: $white; } - -.medium-editor-toolbar-anchor-preview { -background: $sd-blue; -color: $white; } - -.medium-editor-placeholder:after { -color: $white; } diff --git a/webpack.config.js b/webpack.config.js index a913a6115d..bd84a37f32 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -46,9 +46,6 @@ module.exports = function makeConfig(grunt) { jQuery: jQueryModule, 'window.jQuery': jQueryModule, moment: 'moment', - // MediumEditor needs to be globally available, because - // its plugins will not be able to find it otherwise. - MediumEditor: 'medium-editor', }), new webpack.DefinePlugin({ __SUPERDESK_CONFIG__: JSON.stringify(sdConfig), @@ -68,7 +65,6 @@ module.exports = function makeConfig(grunt) { alias: { 'moment-timezone': 'moment-timezone/builds/moment-timezone-with-data-2012-2022', 'rangy-saverestore': 'rangy/lib/rangy-selectionsaverestore', - 'angular-embedly': 'angular-embedly/em-minified/angular-embedly.min', 'jquery-gridster': 'gridster/dist/jquery.gridster.min', 'external-apps': path.join(process.cwd(), 'dist', 'app-importer.generated.js'), }, @@ -231,9 +227,6 @@ function getDefaults(grunt) { features: { // tansa spellchecker useTansaProofing: false, - - // replace editor2 - onlyEditor3: false, }, // workspace defaults From 56fc4656e96a58da7214f90e57fb7ffd7040f9cd Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 25 Oct 2021 11:48:40 +0200 Subject: [PATCH 0085/1070] restore angular embed --- package-lock.json | 2463 ++++++++++++++++- package.json | 2 + scripts/apps/authoring/authoring/index.ts | 11 +- scripts/apps/authoring/macros/macros.spec.ts | 1 + .../apps/authoring/tests/authoring.spec.ts | 1 + scripts/vendor.ts | 2 + webpack.config.js | 1 + 7 files changed, 2356 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b24f524d3..dfb25cfd32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "requires": { "@babel/highlight": "^7.14.5" } @@ -61,9 +61,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==" + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==" }, "@babel/runtime": { "version": "7.15.4", @@ -351,9 +351,9 @@ "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, "@types/glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", "dev": true, "requires": { "@types/minimatch": "*", @@ -404,9 +404,9 @@ } }, "@types/node": { - "version": "16.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.2.tgz", - "integrity": "sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ==" + "version": "16.11.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.3.tgz", + "integrity": "sha512-aIYL9Eemcecs1y77XzFGiSc+FdfN58k4J23UEe6+hynf4Wd9g4DzQPwIKL080vSMuubFqy2hWwOzCtJdc6vFKw==" }, "@types/parse5": { "version": "5.0.3", @@ -456,9 +456,9 @@ } }, "@types/webpack-env": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz", - "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==", + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz", + "integrity": "sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==", "dev": true }, "@typescript-eslint/experimental-utils": { @@ -540,6 +540,14 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, + "active-x-obfuscator": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz", + "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=", + "requires": { + "zeparser": "0.0.5" + } + }, "addressparser": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz", @@ -688,6 +696,108 @@ "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.32.tgz", "integrity": "sha1-0H/qdSgfJbqUpb5bRt8qAsXjWDY=" }, + "angular-embed": { + "version": "github:superdesk/angular-embed#d75968e9eedc2b255f68d0c298a6c91981bc9444", + "from": "github:superdesk/angular-embed#d75968e" + }, + "angular-embedly": { + "version": "github:Urigo/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", + "from": "github:Urigo/angular-embedly#0.0.8", + "requires": { + "gulp": "~3.8.2", + "gulp-concat": "~2.2.0", + "gulp-uglify": "~0.3.1", + "karma": "~0.12.16", + "karma-chrome-launcher": "~0.1.4", + "karma-jasmine": "~0.1.5" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "karma": { + "version": "0.12.37", + "resolved": "https://registry.npmjs.org/karma/-/karma-0.12.37.tgz", + "integrity": "sha1-Gp9/3szWneLoNeBO26wuzT+mReQ=", + "requires": { + "chokidar": "^1.0.1", + "colors": "^1.1.0", + "connect": "^2.29.2", + "di": "^0.0.1", + "glob": "^5.0.6", + "graceful-fs": "^3.0.6", + "http-proxy": "^0.10", + "lodash": "^3.8.0", + "log4js": "^0.6.25", + "mime": "^1.3.4", + "minimatch": "^2.0.7", + "optimist": "^0.6.1", + "q": "^1.4.1", + "rimraf": "^2.3.3", + "socket.io": "0.9.16", + "source-map": "^0.4.2", + "useragent": "^2.1.6" + } + }, + "karma-chrome-launcher": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.12.tgz", + "integrity": "sha1-CsDiLlc2UPZUExL9ynlcOCTM+WI=", + "requires": { + "which": "^1.0.9" + } + }, + "karma-jasmine": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.6.tgz", + "integrity": "sha1-MFRQV2mOvcvGMTLUe+Elt1svvFU=" + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "^1.0.0" + } + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "angular-gettext": { "version": "github:tomaskikutis/angular-gettext#5615f0058ecf7f4aeeb7ec1a24e2cff4426fffa6", "from": "github:tomaskikutis/angular-gettext#master" @@ -749,16 +859,135 @@ "type-fest": "^0.21.3" } }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "requires": { + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "requires": { + "arr-flatten": "^1.0.1" + } + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "requires": { + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "requires": { + "is-posix-bracket": "^0.1.0" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "requires": { + "is-extglob": "^1.0.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "requires": { + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" + } + } + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, "are-we-there-yet": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", @@ -825,6 +1054,11 @@ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" }, + "array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" + }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -847,6 +1081,11 @@ "is-string": "^1.0.7" } }, + "array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -1035,6 +1274,11 @@ "postcss-value-parser": "^3.2.3" } }, + "available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1225,6 +1469,26 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, + "base64-url": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", + "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg=" + }, + "base64id": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", + "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=" + }, + "basic-auth": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz", + "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA=" + }, + "basic-auth-connect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", + "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI=" + }, "batch": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", @@ -1238,6 +1502,11 @@ "tweetnacl": "^0.14.3" } }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" + }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1368,6 +1637,38 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" }, + "body-parser": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", + "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=", + "requires": { + "bytes": "2.1.0", + "content-type": "~1.0.1", + "debug": "~2.2.0", + "depd": "~1.0.1", + "http-errors": "~1.3.1", + "iconv-lite": "0.4.11", + "on-finished": "~2.3.0", + "qs": "4.0.0", + "raw-body": "~2.1.2", + "type-is": "~1.6.6" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -1748,9 +2049,9 @@ } }, "caniuse-db": { - "version": "1.0.30001264", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001264.tgz", - "integrity": "sha512-KwFcCSAaHNukq2lVN/rkxbagGmQKHNwBHZj5ThnEP0bqAIJdIk9pULCbkL9rs0Nf4RSI0zTzl4fmsTg1Pp0Jdg==" + "version": "1.0.30001271", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001271.tgz", + "integrity": "sha512-V7/O06sNu6e54ArdzLA1xFuYJ+kK9XXsO4pYa53ixujAVX/OVCGvDfRICSgkxdk8pdMZ+tA1v5ylLKDHNwUqEg==" }, "caseless": { "version": "0.12.0", @@ -1766,6 +2067,18 @@ "lazy-cache": "^1.0.3" } }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "requires": { + "ansi-styles": "^1.1.0", + "escape-string-regexp": "^1.0.0", + "has-ansi": "^0.1.0", + "strip-ansi": "^0.3.0", + "supports-color": "^0.2.0" + } + }, "change-case": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz", @@ -1879,9 +2192,9 @@ } }, "css-what": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", - "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", "dev": true }, "dom-serializer": { @@ -1938,6 +2251,37 @@ } } }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "requires": { + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -2120,6 +2464,11 @@ } } }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, "clsx": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", @@ -2188,6 +2537,11 @@ "color-name": "^1.0.0" } }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", @@ -2201,8 +2555,7 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, "combine-lists": { "version": "1.0.1", @@ -2221,6 +2574,11 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=" + }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -2323,11 +2681,90 @@ } } }, + "connect": { + "version": "2.30.2", + "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", + "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=", + "requires": { + "basic-auth-connect": "1.0.0", + "body-parser": "~1.13.3", + "bytes": "2.1.0", + "compression": "~1.5.2", + "connect-timeout": "~1.6.2", + "content-type": "~1.0.1", + "cookie": "0.1.3", + "cookie-parser": "~1.3.5", + "cookie-signature": "1.0.6", + "csurf": "~1.8.3", + "debug": "~2.2.0", + "depd": "~1.0.1", + "errorhandler": "~1.4.2", + "express-session": "~1.11.3", + "finalhandler": "0.4.0", + "fresh": "0.3.0", + "http-errors": "~1.3.1", + "method-override": "~2.3.5", + "morgan": "~1.6.1", + "multiparty": "3.3.2", + "on-headers": "~1.0.0", + "parseurl": "~1.3.0", + "pause": "0.1.0", + "qs": "4.0.0", + "response-time": "~2.3.1", + "serve-favicon": "~2.3.0", + "serve-index": "~1.7.2", + "serve-static": "~1.10.0", + "type-is": "~1.6.6", + "utils-merge": "1.0.0", + "vhost": "~3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "connect-history-api-fallback": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, + "connect-timeout": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", + "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=", + "requires": { + "debug": "~2.2.0", + "http-errors": "~1.3.1", + "ms": "0.7.1", + "on-headers": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", @@ -2373,6 +2810,20 @@ "safe-buffer": "~5.1.1" } }, + "cookie": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", + "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=" + }, + "cookie-parser": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", + "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6" + } + }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2393,6 +2844,11 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "crc": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", + "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=" + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -2515,6 +2971,16 @@ } } }, + "csrf": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz", + "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=", + "requires": { + "rndm": "1.2.0", + "tsscmp": "1.0.5", + "uid-safe": "2.1.4" + } + }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -2644,6 +3110,17 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" }, + "csurf": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", + "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6", + "csrf": "~3.0.0", + "http-errors": "~1.3.1" + } + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2698,6 +3175,11 @@ "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", "dev": true }, + "dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -2721,6 +3203,35 @@ "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz", "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=" }, + "deep-equal": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz", + "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==", + "requires": { + "call-bind": "^1.0.0", + "es-get-iterator": "^1.1.1", + "get-intrinsic": "^1.0.1", + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.2", + "is-regex": "^1.1.1", + "isarray": "^2.0.5", + "object-is": "^1.1.4", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "regexp.prototype.flags": "^1.3.0", + "side-channel": "^1.0.3", + "which-boxed-primitive": "^1.0.1", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.2" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + } + } + }, "deep-for-each": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-1.0.6.tgz", @@ -2734,6 +3245,19 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, + "deepmerge": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz", + "integrity": "sha1-iQa/nlJaT78bIDsq/LRkAkmCEhk=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "^1.0.2" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -2835,6 +3359,16 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, + "depd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", + "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=" + }, + "deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" + }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -2849,6 +3383,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" + }, "detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", @@ -2857,8 +3396,7 @@ "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=" }, "diff": { "version": "3.5.0", @@ -3032,6 +3570,14 @@ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.4.0.tgz", "integrity": "sha512-8s9FFuKC+lOWGwJ0b3om2PF+uXrqQPaEQlPJI7UxdzxTYGMeKouMPA9+YlPn52zcAVElIZtd2tXj6eQmvlKelw==" }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "requires": { + "readable-stream": "~1.1.9" + } + }, "each-async": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz", @@ -3070,9 +3616,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.859", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.859.tgz", - "integrity": "sha512-gXRXKNWedfdiKIzwr0Mg/VGCvxXzy+4SuK9hp1BDvfbCwx0O5Ot+2f4CoqQkqEJ3Zj/eAV/GoAFgBVFgkBLXuQ==" + "version": "1.3.877", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.877.tgz", + "integrity": "sha512-fT5mW5Giw5iyVukeHb2XvB4joBKvzHtl8Vs3QzE7APATpFMt/T7RWyUcIKSZzYkKQgpMbu+vDBTCHfQZvh8klA==" }, "elliptic": { "version": "6.5.4", @@ -3128,6 +3674,24 @@ } } }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "requires": { + "once": "~1.3.0" + }, + "dependencies": { + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1" + } + } + } + }, "engine.io": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz", @@ -3525,6 +4089,31 @@ "is-arrayish": "^0.2.1" } }, + "errorhandler": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz", + "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=", + "requires": { + "accepts": "~1.3.0", + "escape-html": "~1.0.3" + }, + "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + } + } + }, "es-abstract": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", @@ -3558,6 +4147,28 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, + "es-get-iterator": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", + "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.0", + "has-symbols": "^1.0.1", + "is-arguments": "^1.1.0", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.5", + "isarray": "^2.0.5" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + } + } + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -3963,6 +4574,11 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, + "etag": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", + "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=" + }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -4196,6 +4812,14 @@ } } }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -4417,6 +5041,45 @@ } } }, + "express-session": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", + "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6", + "crc": "3.3.0", + "debug": "~2.2.0", + "depd": "~1.0.1", + "on-headers": "~1.0.0", + "parseurl": "~1.3.0", + "uid-safe": "~2.0.0", + "utils-merge": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + }, + "uid-safe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", + "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=", + "requires": { + "base64-url": "1.2.1" + } + } + } + }, "ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -4571,6 +5234,17 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, + "fancy-log": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", + "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", + "requires": { + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" + } + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4699,6 +5373,42 @@ } } }, + "finalhandler": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", + "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=", + "requires": { + "debug": "~2.2.0", + "escape-html": "1.0.2", + "on-finished": "~2.3.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "escape-html": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", + "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw=" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" + }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -4734,6 +5444,49 @@ } } }, + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "fined": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", + "requires": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flagged-respawn": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" + }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -4782,6 +5535,11 @@ "for-in": "^1.0.1" } }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -4810,6 +5568,11 @@ "map-cache": "^0.2.2" } }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=" + }, "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -4841,6 +5604,24 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "dependencies": { + "nan": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", + "optional": true + } + } + }, "fstream": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", @@ -4951,6 +5732,14 @@ } } }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "requires": { + "globule": "~0.1.0" + } + }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -5173,16 +5962,108 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "requires": { + "glob": "^4.3.1", + "glob2base": "^0.0.12", + "minimatch": "^2.0.1", + "ordered-read-streams": "^0.1.0", + "through2": "^0.6.1", + "unique-stream": "^1.0.0" + }, + "dependencies": { + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^2.0.1", + "once": "^1.3.0" + } + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "^1.0.0" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { - "is-extglob": "^1.0.0" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" } } } }, + "glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "requires": { + "gaze": "^0.5.1" + } + }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "requires": { + "find-index": "^0.1.1" + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -5207,6 +6088,68 @@ } } }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "requires": { + "glob": "~3.1.21", + "lodash": "~1.0.1", + "minimatch": "~0.2.11" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "requires": { + "graceful-fs": "~1.2.0", + "inherits": "1", + "minimatch": "~0.2.11" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" + }, + "inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" + }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" + }, + "minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "requires": { + "lru-cache": "2", + "sigmund": "~1.0.0" + } + } + } + }, + "glogg": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", + "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", + "requires": { + "sparkles": "^1.0.0" + } + }, + "graceful-fs": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz", + "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==", + "requires": { + "natives": "^1.1.3" + } + }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", @@ -5695,6 +6638,265 @@ "lodash": "^4.7.0" } }, + "gulp": { + "version": "3.8.11", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz", + "integrity": "sha1-1Vfgpyg+tBNkkZabBJd2eXLx0oo=", + "requires": { + "archy": "^1.0.0", + "chalk": "^0.5.0", + "deprecated": "^0.0.1", + "gulp-util": "^3.0.0", + "interpret": "^0.3.2", + "liftoff": "^2.0.1", + "minimist": "^1.1.0", + "orchestrator": "^0.3.0", + "pretty-hrtime": "^0.2.0", + "semver": "^4.1.0", + "tildify": "^1.0.0", + "v8flags": "^2.0.2", + "vinyl-fs": "^0.3.0" + }, + "dependencies": { + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + } + } + }, + "gulp-concat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.2.0.tgz", + "integrity": "sha1-7vw+FYDEzKxkOAbSBnwyK0QaY0Y=", + "requires": { + "gulp-util": "^2.2.5", + "through": "^2.3.4" + }, + "dependencies": { + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "requires": { + "get-stdin": "^4.0.1", + "meow": "^3.3.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "requires": { + "chalk": "^0.5.0", + "dateformat": "^1.0.7-1.2.3", + "lodash._reinterpolate": "^2.4.1", + "lodash.template": "^2.4.1", + "minimist": "^0.2.0", + "multipipe": "^0.1.0", + "through2": "^0.5.0", + "vinyl": "^0.2.1" + } + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", + "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=" + }, + "lodash.escape": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "requires": { + "lodash._escapehtmlchar": "~2.4.1", + "lodash._reunescapedhtml": "~2.4.1", + "lodash.keys": "~2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "requires": { + "lodash._escapestringchar": "~2.4.1", + "lodash._reinterpolate": "~2.4.1", + "lodash.defaults": "~2.4.1", + "lodash.escape": "~2.4.1", + "lodash.keys": "~2.4.1", + "lodash.templatesettings": "~2.4.1", + "lodash.values": "~2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "requires": { + "lodash._reinterpolate": "~2.4.1", + "lodash.escape": "~2.4.1" + } + }, + "minimist": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", + "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "requires": { + "readable-stream": "~1.0.17", + "xtend": "~3.0.0" + } + }, + "vinyl": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", + "requires": { + "clone-stats": "~0.0.1" + } + }, + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=" + } + } + }, + "gulp-uglify": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-0.3.2.tgz", + "integrity": "sha1-+je/bUrZopo0nGy6hiq7Iuumeqw=", + "requires": { + "deepmerge": ">=0.2.7 <0.3.0-0", + "gulp-util": ">=3.0.0 <4.0.0-0", + "through2": ">=0.6.1 <1.0.0-0", + "uglify-js": "2.4.6" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + } + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "requires": { + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", + "replace-ext": "0.0.1", + "through2": "^2.0.0", + "vinyl": "^0.5.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "requires": { + "glogg": "^1.0.0" + } + }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", @@ -5722,6 +6924,14 @@ "function-bind": "^1.1.1" } }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "requires": { + "ansi-regex": "^0.2.0" + } + }, "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -5760,6 +6970,14 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "requires": { + "sparkles": "^1.0.0" + } + }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -5923,6 +7141,14 @@ "react-is": "^16.7.0" } }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "requires": { + "parse-passwd": "^1.0.0" + } + }, "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", @@ -6006,9 +7232,9 @@ }, "dependencies": { "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", "requires": { "source-map": "~0.6.0" } @@ -6162,6 +7388,38 @@ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" }, + "http-proxy": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz", + "integrity": "sha1-FLoM6qIZf4n6MN6p57CeGc2Twi8=", + "requires": { + "colors": "0.x.x", + "optimist": "0.6.x", + "pkginfo": "0.3.x", + "utile": "~0.2.1" + }, + "dependencies": { + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + } + } + }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", @@ -6382,6 +7640,16 @@ } } }, + "i": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz", + "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==" + }, + "iconv-lite": { + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", + "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4=" + }, "icss-replace-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", @@ -6531,6 +7799,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, "inquirer": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", @@ -6627,6 +7900,11 @@ "side-channel": "^1.0.4" } }, + "interpret": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz", + "integrity": "sha1-CIwl3nMcbFsRKpDwBxz69Fnlp7s=" + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -6650,6 +7928,15 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, + "is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "requires": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + } + }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -6731,9 +8018,9 @@ } }, "is-core-module": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", - "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "requires": { "has": "^1.0.3" } @@ -6830,6 +8117,11 @@ "lower-case": "^1.1.0" } }, + "is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" + }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -6942,12 +8234,25 @@ "has-tostringtag": "^1.0.0" } }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "requires": { + "is-unc-path": "^1.0.0" + } + }, "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" + }, "is-shared-array-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", @@ -6988,11 +8293,31 @@ "has-symbols": "^1.0.2" } }, + "is-typed-array": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz", + "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==", + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-abstract": "^1.18.5", + "foreach": "^2.0.5", + "has-tostringtag": "^1.0.0" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "requires": { + "unc-path-regex": "^0.1.2" + } + }, "is-upper-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", @@ -7006,6 +8331,11 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, + "is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" + }, "is-weakref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", @@ -7014,6 +8344,11 @@ "call-bind": "^1.0.0" } }, + "is-weakset": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", + "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -7027,9 +8362,7 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true, - "optional": true + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, "isbinaryfile": { "version": "3.0.3", @@ -7406,16 +8739,6 @@ "unpipe": "~1.0.0" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -7814,6 +9137,21 @@ "dev": true, "optional": true }, + "liftoff": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", + "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "requires": { + "extend": "^3.0.0", + "findup-sync": "^2.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" + } + }, "load-grunt-config": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-0.19.2.tgz", @@ -7950,6 +9288,108 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "lodash._escapehtmlchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", + "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", + "requires": { + "lodash._htmlescapes": "~2.4.1" + } + }, + "lodash._escapestringchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", + "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=" + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "lodash._htmlescapes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", + "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "lodash._isnative": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", + "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=" + }, + "lodash._objecttypes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", + "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=" + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash._reunescapedhtml": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", + "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", + "requires": { + "lodash._htmlescapes": "~2.4.1", + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "lodash._shimkeys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", + "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", + "requires": { + "lodash._objecttypes": "~2.4.1" + } + }, "lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", @@ -7970,6 +9410,35 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, + "lodash.defaults": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", + "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", + "requires": { + "lodash._objecttypes": "~2.4.1", + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "requires": { + "lodash._root": "^3.0.0" + } + }, "lodash.filter": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", @@ -7991,12 +9460,40 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "requires": { + "lodash._objecttypes": "~2.4.1" + } + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "requires": { + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" + } + }, "lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", @@ -8027,6 +9524,11 @@ "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", @@ -8037,6 +9539,31 @@ "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=" }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "requires": { + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "requires": { + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" + } + }, "lodash.unescape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", @@ -8048,6 +9575,53 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, + "lodash.values": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", + "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", + "requires": { + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "log4js": { + "version": "0.6.38", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", + "requires": { + "readable-stream": "~1.0.2", + "semver": "~4.3.3" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + } + } + }, "loggly": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz", @@ -8297,6 +9871,11 @@ "lower-case": "^1.1.2" } }, + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + }, "mailcomposer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz", @@ -8355,6 +9934,14 @@ } } }, + "make-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", + "requires": { + "kind-of": "^6.0.2" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -8485,6 +10072,37 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, + "method-override": { + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz", + "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=", + "requires": { + "debug": "2.6.9", + "methods": "~1.1.2", + "parseurl": "~1.3.2", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + } + } + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -8639,6 +10257,33 @@ "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==", "dev": true }, + "morgan": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", + "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=", + "requires": { + "basic-auth": "~1.0.3", + "debug": "~2.2.0", + "depd": "~1.0.1", + "on-finished": "~2.3.0", + "on-headers": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -8669,11 +10314,33 @@ "minimatch": "^3.0.0" } }, + "multiparty": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", + "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8=", + "requires": { + "readable-stream": "~1.1.9", + "stream-counter": "~0.2.0" + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "requires": { + "duplexer2": "0.0.2" + } + }, "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=" + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -8692,6 +10359,11 @@ "to-regex": "^3.0.1" } }, + "natives": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", + "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -8705,6 +10377,11 @@ "xml-char-classes": "^1.0.0" } }, + "ncp": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", + "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=" + }, "nearley": { "version": "2.20.1", "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", @@ -9247,6 +10924,11 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, "object-component": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", @@ -9319,6 +11001,17 @@ "object-keys": "^1.1.1" } }, + "object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "requires": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + } + }, "object.entries": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", @@ -9339,6 +11032,15 @@ "es-abstract": "^1.19.1" } }, + "object.map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -9418,6 +11120,14 @@ "is-wsl": "^1.1.0" } }, + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "requires": { + "wordwrap": "~0.0.2" + } + }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -9431,6 +11141,26 @@ "word-wrap": "~1.2.3" } }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=" + }, + "orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "requires": { + "end-of-stream": "~0.1.5", + "sequencify": "~0.0.7", + "stream-consume": "~0.1.0" + } + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" + }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -9650,6 +11380,16 @@ "safe-buffer": "^5.1.1" } }, + "parse-filepath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "requires": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + } + }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -9684,6 +11424,16 @@ "error-ex": "^1.2.0" } }, + "parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -9858,6 +11608,19 @@ } } }, + "path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "requires": { + "path-root-regex": "^0.1.0" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -9880,6 +11643,11 @@ } } }, + "pause": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", + "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q=" + }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", @@ -9947,6 +11715,11 @@ "find-up": "^1.0.0" } }, + "pkginfo": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", + "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=" + }, "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", @@ -9967,6 +11740,11 @@ "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.11.tgz", "integrity": "sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg==" }, + "policyfile": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz", + "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0=" + }, "popper.js": { "version": "1.14.4", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", @@ -10588,6 +12366,11 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, + "pretty-hrtime": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz", + "integrity": "sha1-1P2INR46R0H4Fzr31qS4RvmJXAA=" + }, "primeicons": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-2.0.0.tgz", @@ -10804,6 +12587,11 @@ "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", "dev": true }, + "qs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", + "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=" + }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", @@ -10860,6 +12648,11 @@ "ret": "~0.1.10" } }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" + }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -10909,6 +12702,28 @@ "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.22.3.tgz", "integrity": "sha512-pIzHpAggyTOGJE3ruAKdZNK5qhO4V21kR7lwpdUM875yHpq1cqeGzvs78/RufF3g7NaAvVmMPCbaV9uUhQzJ3A==" }, + "raw-body": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=", + "requires": { + "bytes": "2.4.0", + "iconv-lite": "0.4.13", + "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=" + }, + "iconv-lite": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=" + } + } + }, "react": { "version": "16.9.0", "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", @@ -11228,8 +13043,6 @@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -11316,6 +13129,12 @@ "strip-indent": "^1.0.1" } }, + "redis": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz", + "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=", + "optional": true + }, "redis-commands": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", @@ -11479,6 +13298,11 @@ "is-finite": "^1.0.0" } }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -11596,6 +13420,15 @@ } } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -11616,11 +13449,27 @@ } } }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "response-time": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", + "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", + "requires": { + "depd": "~1.1.0", + "on-headers": "~1.0.1" + }, + "dependencies": { + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + } + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -11660,6 +13509,11 @@ "inherits": "^2.0.1" } }, + "rndm": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", + "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" + }, "rst-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", @@ -11927,6 +13781,55 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, + "send": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", + "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=", + "requires": { + "debug": "~2.2.0", + "depd": "~1.1.0", + "destroy": "~1.0.4", + "escape-html": "~1.0.3", + "etag": "~1.7.0", + "fresh": "0.3.0", + "http-errors": "~1.3.1", + "mime": "1.3.4", + "ms": "0.7.1", + "on-finished": "~2.3.0", + "range-parser": "~1.0.3", + "statuses": "~1.2.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + }, + "statuses": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", + "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg=" + } + } + }, "sentence-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", @@ -11936,6 +13839,29 @@ "upper-case-first": "^1.1.2" } }, + "sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" + }, + "serve-favicon": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz", + "integrity": "sha1-3UGeJo3gEqtysxnTN/IQUBP5OB8=", + "requires": { + "etag": "~1.7.0", + "fresh": "0.3.0", + "ms": "0.7.2", + "parseurl": "~1.3.1" + }, + "dependencies": { + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=" + } + } + }, "serve-index": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz", @@ -11965,6 +13891,16 @@ } } }, + "serve-static": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", + "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=", + "requires": { + "escape-html": "~1.0.3", + "parseurl": "~1.3.1", + "send": "0.13.2" + } + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -12081,6 +14017,11 @@ "object-inspect": "^1.9.0" } }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, "signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -12272,12 +14213,41 @@ "hoek": "2.x.x" } }, + "socket.io": { + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", + "integrity": "sha1-O6sEROSbVfu8FXQk29Qao3WlGnY=", + "requires": { + "base64id": "0.1.0", + "policyfile": "0.0.4", + "redis": "0.7.3", + "socket.io-client": "0.9.16" + } + }, "socket.io-adapter": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", "dev": true }, + "socket.io-client": { + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz", + "integrity": "sha1-TadRXF53MEHRtCOXBBW8xDDzX8Y=", + "requires": { + "active-x-obfuscator": "0.0.1", + "uglify-js": "1.2.5", + "ws": "0.4.x", + "xmlhttprequest": "1.4.2" + }, + "dependencies": { + "uglify-js": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", + "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY=" + } + } + }, "socket.io-parser": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz", @@ -12440,6 +14410,11 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, + "sparkles": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", + "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" + }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -12680,6 +14655,19 @@ } } }, + "stream-consume": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", + "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" + }, + "stream-counter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", + "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=", + "requires": { + "readable-stream": "~1.1.8" + } + }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", @@ -12836,9 +14824,7 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true, - "optional": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "stringstream": { "version": "0.0.6", @@ -12847,6 +14833,23 @@ "dev": true, "optional": true }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "requires": { + "ansi-regex": "^0.2.1" + } + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "requires": { + "first-chunk-stream": "^1.0.0", + "is-utf8": "^0.2.0" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -13392,12 +15395,17 @@ }, "dependencies": { "@types/node": { - "version": "14.17.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz", - "integrity": "sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ==" + "version": "14.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.28.tgz", + "integrity": "sha512-1Nh2wEWN8y9hyC4yTDPccUnRunqNeBEFmmTU+K5FpGZOEixqAzMhUXzrBwajNYCZq5uoGaztaMN9Yy1PDMMB6Q==" } } }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + }, "svgo": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", @@ -13504,6 +15512,44 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "thunkify": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", @@ -13516,6 +15562,19 @@ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "requires": { + "os-homedir": "^1.0.0" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" + }, "timers-browserify": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", @@ -13531,6 +15590,11 @@ "dev": true, "optional": true }, + "tinycolor": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", + "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=" + }, "title-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", @@ -13752,9 +15816,7 @@ "tsscmp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=", - "dev": true, - "optional": true + "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=" }, "tsutils": { "version": "3.21.0", @@ -13847,9 +15909,30 @@ } }, "ua-parser-js": { - "version": "0.7.28", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", - "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==" + "version": "0.7.30", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz", + "integrity": "sha512-uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg==" + }, + "uglify-js": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz", + "integrity": "sha1-MXZqTYIrq/XzLBQJYlHtklkpitM=", + "requires": { + "async": "~0.2.6", + "optimist": "~0.3.5", + "source-map": "~0.1.7", + "uglify-to-browserify": "~1.0.0" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } }, "uglify-to-browserify": { "version": "1.0.2", @@ -13878,6 +15961,14 @@ } } }, + "uid-safe": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz", + "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=", + "requires": { + "random-bytes": "~1.0.0" + } + }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -13895,6 +15986,11 @@ "which-boxed-primitive": "^1.0.2" } }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + }, "uncontrollable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz", @@ -13934,6 +16030,11 @@ "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, + "unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" + }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -14051,6 +16152,31 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, + "useragent": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", + "requires": { + "lru-cache": "4.1.x", + "tmp": "0.0.x" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + } + } + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -14071,6 +16197,24 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "utile": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", + "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", + "requires": { + "async": "~0.2.9", + "deep-equal": "*", + "i": "0.3.x", + "mkdirp": "0.x.x", + "ncp": "0.4.x", + "rimraf": "2.x.x" + } + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" + }, "uuid": { "version": "8.3.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", @@ -14088,6 +16232,14 @@ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "requires": { + "user-home": "^1.1.1" + } + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -14124,6 +16276,72 @@ } } }, + "vhost": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", + "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=" + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "requires": { + "clone": "^1.0.0", + "clone-stats": "^0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "requires": { + "defaults": "^1.0.0", + "glob-stream": "^3.1.5", + "glob-watcher": "^0.0.6", + "graceful-fs": "^3.0.0", + "mkdirp": "^0.5.0", + "strip-bom": "^1.0.0", + "through2": "^0.6.1", + "vinyl": "^0.4.0" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "^0.2.0", + "clone-stats": "^0.0.1" + } + } + } + }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -14315,15 +16533,6 @@ "upath": "^1.1.1" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -14718,15 +16927,6 @@ "ms": "^2.1.1" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -14888,46 +17088,41 @@ "is-symbol": "^1.0.3" } }, + "which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "requires": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + } + }, "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, + "which-typed-array": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz", + "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==", + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-abstract": "^1.18.5", + "foreach": "^2.0.5", + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.7" + } + }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "window-size": { @@ -14950,8 +17145,7 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" }, "wrap-ansi": { "version": "2.1.0", @@ -15008,11 +17202,27 @@ "mkdirp": "^0.5.1" } }, + "ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", + "requires": { + "commander": "~2.1.0", + "nan": "~1.0.0", + "options": ">=0.0.5", + "tinycolor": "0.x" + } + }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=" }, + "xmlhttprequest": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz", + "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA=" + }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", @@ -15080,6 +17290,11 @@ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true + }, + "zeparser": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz", + "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI=" } } } diff --git a/package.json b/package.json index c027ce2121..99d7a618d7 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,8 @@ "angular": "1.6.9", "angular-contenteditable": "0.3.9", "angular-dynamic-locale": "0.1.32", + "angular-embed": "github:superdesk/angular-embed#d75968e", + "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index f40201d1fb..559697b240 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -86,6 +86,7 @@ angular.module('superdesk.apps.authoring', [ 'contenteditable', 'decipher.history', 'superdesk.config', + 'angular-embed', mediaModule.name, ]) @@ -423,7 +424,15 @@ angular.module('superdesk.apps.authoring', [ }, }); }]) - .run(['keyboardManager', 'gettext', function(keyboardManager) { + .config(['embedServiceProvider', 'iframelyServiceProvider', + function(embedServiceProvider, iframelyServiceProvider) { + iframelyServiceProvider.setKey(appConfig.iframely.key); + // don't use noembed as first choice + embedServiceProvider.setConfig('useOnlyFallback', true); + // iframely respect the original embed for more services than 'embedly' + embedServiceProvider.setConfig('fallbackService', 'iframely'); + }]) + .run(['keyboardManager', 'embedService', function(keyboardManager) { keyboardManager.register('Authoring', 'ctrl + shift + u', gettext('Unlock current item')); keyboardManager.register('Authoring', 'ctrl + shift + e', gettext('Close current item')); keyboardManager.register('Authoring', 'ctrl + shift + s', gettext('Save current item')); diff --git a/scripts/apps/authoring/macros/macros.spec.ts b/scripts/apps/authoring/macros/macros.spec.ts index d142df5754..eee7e8136f 100644 --- a/scripts/apps/authoring/macros/macros.spec.ts +++ b/scripts/apps/authoring/macros/macros.spec.ts @@ -25,6 +25,7 @@ describe('macros', () => { }, ]; + beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index feb1c28818..66f0c73ed9 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -13,6 +13,7 @@ describe('authoring', () => { $provide.constant('lodash', _); })); + beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); diff --git a/scripts/vendor.ts b/scripts/vendor.ts index 152b8aabe0..48a3fbfd6f 100644 --- a/scripts/vendor.ts +++ b/scripts/vendor.ts @@ -8,6 +8,8 @@ import 'angular'; import 'angular-resource'; import 'angular-route'; import 'angular-gettext'; +import 'angular-embedly'; +import 'angular-embed'; import 'angular-contenteditable'; import 'angular-vs-repeat'; import 'angular-moment'; diff --git a/webpack.config.js b/webpack.config.js index bd84a37f32..912bb0b45d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -65,6 +65,7 @@ module.exports = function makeConfig(grunt) { alias: { 'moment-timezone': 'moment-timezone/builds/moment-timezone-with-data-2012-2022', 'rangy-saverestore': 'rangy/lib/rangy-selectionsaverestore', + 'angular-embedly': 'angular-embedly/em-minified/angular-embedly.min', 'jquery-gridster': 'gridster/dist/jquery.gridster.min', 'external-apps': path.join(process.cwd(), 'dist', 'app-importer.generated.js'), }, From 22ac1c498eb2955c14f13a57b4377fbc8d1a0a97 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 25 Oct 2021 12:27:00 +0200 Subject: [PATCH 0086/1070] remove conditionals checking whether editor3 is enabled --- scripts/apps/authoring/macros/macros.ts | 2 +- scripts/apps/authoring/track-changes/inline-comments.ts | 9 ++++++--- scripts/apps/authoring/track-changes/suggestions.ts | 9 ++++++--- .../content/controllers/ContentProfilesController.ts | 2 -- .../content/directives/ContentProfileSchemaEditor.ts | 5 +---- .../apps/workspace/content/views/profile-settings.html | 3 --- scripts/apps/workspace/content/views/schema-editor.html | 4 ++-- scripts/core/superdesk-api.d.ts | 1 - 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/scripts/apps/authoring/macros/macros.ts b/scripts/apps/authoring/macros/macros.ts index 747f75e90d..ef859d71ed 100644 --- a/scripts/apps/authoring/macros/macros.ts +++ b/scripts/apps/authoring/macros/macros.ts @@ -165,7 +165,7 @@ function MacrosController($scope, macros, desks, autosave, $rootScope, storage, */ $scope.call = function(macro) { const editor = editorResolver.get(); - const isEditor3 = editor.version() !== '2'; + const isEditor3 = editor.version() === '3'; const useReplace = macro.replace_type != null && macro.replace_type !== 'no-replace'; const isSimpleReplace = macro.replace_type === 'simple-replace'; let item = _.extend({}, $scope.origItem, $scope.item); diff --git a/scripts/apps/authoring/track-changes/inline-comments.ts b/scripts/apps/authoring/track-changes/inline-comments.ts index 13b54cf73a..d927361f7c 100644 --- a/scripts/apps/authoring/track-changes/inline-comments.ts +++ b/scripts/apps/authoring/track-changes/inline-comments.ts @@ -155,9 +155,12 @@ angular return new Promise((resolve) => { content.getType(item.profile).then((type) => { - const editor3enabled = get(type, 'editor.body_html.editor3') === true; - - resolve(editor3enabled); + /** + * It used to be checked whether editor3 is enabled, + * but now that editor3 is the only editor + * it is only checked whether content profile has body_html field + */ + resolve(type?.editor?.body_html != null); }); }); }], diff --git a/scripts/apps/authoring/track-changes/suggestions.ts b/scripts/apps/authoring/track-changes/suggestions.ts index d20a679892..4395695810 100644 --- a/scripts/apps/authoring/track-changes/suggestions.ts +++ b/scripts/apps/authoring/track-changes/suggestions.ts @@ -109,9 +109,12 @@ angular return new Promise((resolve) => { content.getType(item.profile).then((type) => { - const editor3enabled = get(type, 'editor.body_html.editor3') === true; - - resolve(editor3enabled); + /** + * It used to be checked whether editor3 is enabled, + * but now that editor3 is the only editor + * it is only checked whether content profile has body_html field + */ + resolve(type?.editor?.body_html != null); }); }); }], diff --git a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts index eada49eb94..b4eb2100f5 100644 --- a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts +++ b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts @@ -33,8 +33,6 @@ export function ContentProfilesController($scope, $location, notify, content, mo }); }; - $scope.withEditor3 = appConfig.features != null && appConfig.features.editor3; - /** * @description Refreshes the list of content profiles by fetching them. * @returns {Promise} diff --git a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts b/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts index b5cb062ea8..943107b632 100644 --- a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts +++ b/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts @@ -194,10 +194,7 @@ export function ContentProfileSchemaEditor(vocabularies) { */ scope.hasFormatOptions = (field) => Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(field) - || ( - scope.model.editor.body_html.editor3 === true - && Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(field) - ) + || Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(field) || hasCustomFieldFormatOptions(field); /** diff --git a/scripts/apps/workspace/content/views/profile-settings.html b/scripts/apps/workspace/content/views/profile-settings.html index 8dc772b74f..4ab89f78e3 100644 --- a/scripts/apps/workspace/content/views/profile-settings.html +++ b/scripts/apps/workspace/content/views/profile-settings.html @@ -107,9 +107,6 @@

{{ :: 'Editing' | translate }} "{{ editing.form.label
-
- -
diff --git a/scripts/apps/workspace/content/views/schema-editor.html b/scripts/apps/workspace/content/views/schema-editor.html index dbfef67af7..b45498ab9a 100644 --- a/scripts/apps/workspace/content/views/schema-editor.html +++ b/scripts/apps/workspace/content/views/schema-editor.html @@ -78,9 +78,9 @@
-
+
-
Date: Fri, 22 Oct 2021 19:44:08 +0200 Subject: [PATCH 0087/1070] remove editor2 --- package-lock.json | 2365 +---------------- package.json | 4 - .../directives/ArticleEditDirective.ts | 9 - .../authoring/services/HistoryFactory.ts | 9 +- scripts/apps/authoring/macros/macros.spec.ts | 2 - scripts/apps/authoring/styles/authoring.scss | 53 - .../apps/authoring/tests/authoring.spec.ts | 7 +- .../apps/authoring/views/article-edit.html | 134 +- scripts/apps/index.ts | 1 - scripts/apps/ingest/services/SendService.ts | 1 - scripts/apps/workspace/content/constants.ts | 3 +- .../content/views/schema-editor.html | 10 - scripts/core/editor2/add-content.ts | 146 - scripts/core/editor2/add-embed.ctrl.ts | 133 - scripts/core/editor2/customAnchor.ts | 48 - scripts/core/editor2/editor.ctrl.ts | 401 --- scripts/core/editor2/editor.spec.ts | 165 -- scripts/core/editor2/editor.ts | 1771 ------------ .../core/editor2/embedCodeHandlers.spec.ts | 107 - scripts/core/editor2/embedCodeHandlers.ts | 25 - scripts/core/editor2/index.ts | 13 - scripts/core/editor2/styles/editor.scss | 245 -- scripts/core/editor2/views/add-content.html | 25 - scripts/core/editor2/views/add-embed.html | 21 - scripts/core/editor2/views/block-embed.html | 37 - scripts/core/editor2/views/block-text.html | 29 - scripts/core/editor2/views/editor.html | 45 - scripts/core/editor3/index.ts | 12 +- scripts/core/editor3/service.ts | 3 +- scripts/core/index.ts | 1 - scripts/core/spellcheck/spellcheck.spec.ts | 1 - scripts/core/superdesk-api.d.ts | 1 - scripts/index.ts | 2 - scripts/vendor.ts | 2 - styles/sass/app.scss | 1 - styles/sass/medium-editor.scss | 274 -- webpack.config.js | 7 - 37 files changed, 59 insertions(+), 6054 deletions(-) delete mode 100644 scripts/core/editor2/add-content.ts delete mode 100644 scripts/core/editor2/add-embed.ctrl.ts delete mode 100644 scripts/core/editor2/customAnchor.ts delete mode 100644 scripts/core/editor2/editor.ctrl.ts delete mode 100644 scripts/core/editor2/editor.spec.ts delete mode 100644 scripts/core/editor2/editor.ts delete mode 100644 scripts/core/editor2/embedCodeHandlers.spec.ts delete mode 100644 scripts/core/editor2/embedCodeHandlers.ts delete mode 100644 scripts/core/editor2/index.ts delete mode 100644 scripts/core/editor2/styles/editor.scss delete mode 100644 scripts/core/editor2/views/add-content.html delete mode 100644 scripts/core/editor2/views/add-embed.html delete mode 100644 scripts/core/editor2/views/block-embed.html delete mode 100644 scripts/core/editor2/views/block-text.html delete mode 100644 scripts/core/editor2/views/editor.html delete mode 100644 styles/sass/medium-editor.scss diff --git a/package-lock.json b/package-lock.json index b11a0a3984..7b24f524d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -540,14 +540,6 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, - "active-x-obfuscator": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz", - "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=", - "requires": { - "zeparser": "0.0.5" - } - }, "addressparser": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz", @@ -696,108 +688,6 @@ "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.32.tgz", "integrity": "sha1-0H/qdSgfJbqUpb5bRt8qAsXjWDY=" }, - "angular-embed": { - "version": "github:superdesk/angular-embed#d75968e9eedc2b255f68d0c298a6c91981bc9444", - "from": "github:superdesk/angular-embed#d75968e" - }, - "angular-embedly": { - "version": "github:Urigo/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", - "from": "github:Urigo/angular-embedly#0.0.8", - "requires": { - "gulp": "~3.8.2", - "gulp-concat": "~2.2.0", - "gulp-uglify": "~0.3.1", - "karma": "~0.12.16", - "karma-chrome-launcher": "~0.1.4", - "karma-jasmine": "~0.1.5" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "karma": { - "version": "0.12.37", - "resolved": "https://registry.npmjs.org/karma/-/karma-0.12.37.tgz", - "integrity": "sha1-Gp9/3szWneLoNeBO26wuzT+mReQ=", - "requires": { - "chokidar": "^1.0.1", - "colors": "^1.1.0", - "connect": "^2.29.2", - "di": "^0.0.1", - "glob": "^5.0.6", - "graceful-fs": "^3.0.6", - "http-proxy": "^0.10", - "lodash": "^3.8.0", - "log4js": "^0.6.25", - "mime": "^1.3.4", - "minimatch": "^2.0.7", - "optimist": "^0.6.1", - "q": "^1.4.1", - "rimraf": "^2.3.3", - "socket.io": "0.9.16", - "source-map": "^0.4.2", - "useragent": "^2.1.6" - } - }, - "karma-chrome-launcher": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.12.tgz", - "integrity": "sha1-CsDiLlc2UPZUExL9ynlcOCTM+WI=", - "requires": { - "which": "^1.0.9" - } - }, - "karma-jasmine": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.6.tgz", - "integrity": "sha1-MFRQV2mOvcvGMTLUe+Elt1svvFU=" - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "requires": { - "brace-expansion": "^1.0.0" - } - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "angular-gettext": { "version": "github:tomaskikutis/angular-gettext#5615f0058ecf7f4aeeb7ec1a24e2cff4426fffa6", "from": "github:tomaskikutis/angular-gettext#master" @@ -859,135 +749,16 @@ "type-fest": "^0.21.3" } }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "requires": { - "ansi-wrap": "0.1.0" - } - }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" - }, - "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - } - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" - }, "are-we-there-yet": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", @@ -1054,11 +825,6 @@ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" - }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -1081,11 +847,6 @@ "is-string": "^1.0.7" } }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -1274,11 +1035,6 @@ "postcss-value-parser": "^3.2.3" } }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1469,26 +1225,6 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, - "base64-url": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", - "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg=" - }, - "base64id": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", - "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=" - }, - "basic-auth": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz", - "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA=" - }, - "basic-auth-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI=" - }, "batch": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", @@ -1502,11 +1238,6 @@ "tweetnacl": "^0.14.3" } }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" - }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1637,38 +1368,6 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" }, - "body-parser": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", - "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=", - "requires": { - "bytes": "2.1.0", - "content-type": "~1.0.1", - "debug": "~2.2.0", - "depd": "~1.0.1", - "http-errors": "~1.3.1", - "iconv-lite": "0.4.11", - "on-finished": "~2.3.0", - "qs": "4.0.0", - "raw-body": "~2.1.2", - "type-is": "~1.6.6" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -2067,18 +1766,6 @@ "lazy-cache": "^1.0.3" } }, - "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", - "requires": { - "ansi-styles": "^1.1.0", - "escape-string-regexp": "^1.0.0", - "has-ansi": "^0.1.0", - "strip-ansi": "^0.3.0", - "supports-color": "^0.2.0" - } - }, "change-case": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz", @@ -2251,46 +1938,6 @@ } } }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - }, - "dependencies": { - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -2473,11 +2120,6 @@ } } }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" - }, "clsx": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", @@ -2546,11 +2188,6 @@ "color-name": "^1.0.0" } }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" - }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", @@ -2564,7 +2201,8 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true }, "combine-lists": { "version": "1.0.1", @@ -2583,11 +2221,6 @@ "delayed-stream": "~1.0.0" } }, - "commander": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=" - }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -2690,104 +2323,25 @@ } } }, - "connect": { - "version": "2.30.2", - "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", - "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=", - "requires": { - "basic-auth-connect": "1.0.0", - "body-parser": "~1.13.3", - "bytes": "2.1.0", - "compression": "~1.5.2", - "connect-timeout": "~1.6.2", - "content-type": "~1.0.1", - "cookie": "0.1.3", - "cookie-parser": "~1.3.5", - "cookie-signature": "1.0.6", - "csurf": "~1.8.3", - "debug": "~2.2.0", - "depd": "~1.0.1", - "errorhandler": "~1.4.2", - "express-session": "~1.11.3", - "finalhandler": "0.4.0", - "fresh": "0.3.0", - "http-errors": "~1.3.1", - "method-override": "~2.3.5", - "morgan": "~1.6.1", - "multiparty": "3.3.2", - "on-headers": "~1.0.0", - "parseurl": "~1.3.0", - "pause": "0.1.0", - "qs": "4.0.0", - "response-time": "~2.3.1", - "serve-favicon": "~2.3.0", - "serve-index": "~1.7.2", - "serve-static": "~1.10.0", - "type-is": "~1.6.6", - "utils-merge": "1.0.0", - "vhost": "~3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" - }, - "connect-timeout": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", - "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=", - "requires": { - "debug": "~2.2.0", - "http-errors": "~1.3.1", - "ms": "0.7.1", - "on-headers": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "constant-case": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", - "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", + "connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" + }, + "console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "constant-case": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", + "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=", "requires": { "snake-case": "^2.1.0", "upper-case": "^1.1.1" @@ -2819,20 +2373,6 @@ "safe-buffer": "~5.1.1" } }, - "cookie": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=" - }, - "cookie-parser": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", - "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6" - } - }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2853,11 +2393,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, - "crc": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", - "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=" - }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -2980,16 +2515,6 @@ } } }, - "csrf": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz", - "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=", - "requires": { - "rndm": "1.2.0", - "tsscmp": "1.0.5", - "uid-safe": "2.1.4" - } - }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -3119,17 +2644,6 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" }, - "csurf": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", - "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6", - "csrf": "~3.0.0", - "http-errors": "~1.3.1" - } - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -3184,11 +2698,6 @@ "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", "dev": true }, - "dateformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", - "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" - }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -3212,35 +2721,6 @@ "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz", "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=" }, - "deep-equal": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz", - "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==", - "requires": { - "call-bind": "^1.0.0", - "es-get-iterator": "^1.1.1", - "get-intrinsic": "^1.0.1", - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.2", - "is-regex": "^1.1.1", - "isarray": "^2.0.5", - "object-is": "^1.1.4", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.3", - "which-boxed-primitive": "^1.0.1", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.2" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - } - } - }, "deep-for-each": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-1.0.6.tgz", @@ -3254,19 +2734,6 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, - "deepmerge": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz", - "integrity": "sha1-iQa/nlJaT78bIDsq/LRkAkmCEhk=" - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "^1.0.2" - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3368,16 +2835,6 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, - "depd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=" - }, - "deprecated": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", - "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" - }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -3392,11 +2849,6 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" - }, "detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", @@ -3405,7 +2857,8 @@ "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=" + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", + "dev": true }, "diff": { "version": "3.5.0", @@ -3579,14 +3032,6 @@ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.4.0.tgz", "integrity": "sha512-8s9FFuKC+lOWGwJ0b3om2PF+uXrqQPaEQlPJI7UxdzxTYGMeKouMPA9+YlPn52zcAVElIZtd2tXj6eQmvlKelw==" }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "requires": { - "readable-stream": "~1.1.9" - } - }, "each-async": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz", @@ -3683,24 +3128,6 @@ } } }, - "end-of-stream": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", - "requires": { - "once": "~1.3.0" - }, - "dependencies": { - "once": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", - "requires": { - "wrappy": "1" - } - } - } - }, "engine.io": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz", @@ -4098,31 +3525,6 @@ "is-arrayish": "^0.2.1" } }, - "errorhandler": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz", - "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=", - "requires": { - "accepts": "~1.3.0", - "escape-html": "~1.0.3" - }, - "dependencies": { - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" - } - } - }, "es-abstract": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", @@ -4156,28 +3558,6 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, - "es-get-iterator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", - "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.0", - "has-symbols": "^1.0.1", - "is-arguments": "^1.1.0", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - } - } - }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -4583,11 +3963,6 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, - "etag": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=" - }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -4821,14 +4196,6 @@ } } }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -5050,45 +4417,6 @@ } } }, - "express-session": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", - "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=", - "requires": { - "cookie": "0.1.3", - "cookie-signature": "1.0.6", - "crc": "3.3.0", - "debug": "~2.2.0", - "depd": "~1.0.1", - "on-headers": "~1.0.0", - "parseurl": "~1.3.0", - "uid-safe": "~2.0.0", - "utils-merge": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - }, - "uid-safe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", - "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=", - "requires": { - "base64-url": "1.2.1" - } - } - } - }, "ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -5243,17 +4571,6 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5382,42 +4699,6 @@ } } }, - "finalhandler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=", - "requires": { - "debug": "~2.2.0", - "escape-html": "1.0.2", - "on-finished": "~2.3.0", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw=" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" - }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -5453,49 +4734,6 @@ } } }, - "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" - }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -5544,11 +4782,6 @@ "for-in": "^1.0.1" } }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -5577,11 +4810,6 @@ "map-cache": "^0.2.2" } }, - "fresh": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=" - }, "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -5723,14 +4951,6 @@ } } }, - "gaze": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", - "requires": { - "globule": "~0.1.0" - } - }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -5963,98 +5183,6 @@ } } }, - "glob-stream": { - "version": "3.1.18", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", - "requires": { - "glob": "^4.3.1", - "glob2base": "^0.0.12", - "minimatch": "^2.0.1", - "ordered-read-streams": "^0.1.0", - "through2": "^0.6.1", - "unique-stream": "^1.0.0" - }, - "dependencies": { - "glob": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^2.0.1", - "once": "^1.3.0" - } - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "requires": { - "brace-expansion": "^1.0.0" - } - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, - "glob-watcher": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", - "requires": { - "gaze": "^0.5.1" - } - }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", - "requires": { - "find-index": "^0.1.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -6079,68 +5207,6 @@ } } }, - "globule": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", - "requires": { - "glob": "~3.1.21", - "lodash": "~1.0.1", - "minimatch": "~0.2.11" - }, - "dependencies": { - "glob": { - "version": "3.1.21", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", - "requires": { - "graceful-fs": "~1.2.0", - "inherits": "1", - "minimatch": "~0.2.11" - } - }, - "graceful-fs": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" - }, - "inherits": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" - }, - "lodash": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" - }, - "minimatch": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", - "requires": { - "lru-cache": "2", - "sigmund": "~1.0.0" - } - } - } - }, - "glogg": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", - "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", - "requires": { - "sparkles": "^1.0.0" - } - }, - "graceful-fs": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz", - "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==", - "requires": { - "natives": "^1.1.3" - } - }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", @@ -6629,265 +5695,6 @@ "lodash": "^4.7.0" } }, - "gulp": { - "version": "3.8.11", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz", - "integrity": "sha1-1Vfgpyg+tBNkkZabBJd2eXLx0oo=", - "requires": { - "archy": "^1.0.0", - "chalk": "^0.5.0", - "deprecated": "^0.0.1", - "gulp-util": "^3.0.0", - "interpret": "^0.3.2", - "liftoff": "^2.0.1", - "minimist": "^1.1.0", - "orchestrator": "^0.3.0", - "pretty-hrtime": "^0.2.0", - "semver": "^4.1.0", - "tildify": "^1.0.0", - "v8flags": "^2.0.2", - "vinyl-fs": "^0.3.0" - }, - "dependencies": { - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" - } - } - }, - "gulp-concat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.2.0.tgz", - "integrity": "sha1-7vw+FYDEzKxkOAbSBnwyK0QaY0Y=", - "requires": { - "gulp-util": "^2.2.5", - "through": "^2.3.4" - }, - "dependencies": { - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "requires": { - "get-stdin": "^4.0.1", - "meow": "^3.3.0" - } - }, - "gulp-util": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", - "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", - "requires": { - "chalk": "^0.5.0", - "dateformat": "^1.0.7-1.2.3", - "lodash._reinterpolate": "^2.4.1", - "lodash.template": "^2.4.1", - "minimist": "^0.2.0", - "multipipe": "^0.1.0", - "through2": "^0.5.0", - "vinyl": "^0.2.1" - } - }, - "lodash._reinterpolate": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", - "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=" - }, - "lodash.escape": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", - "requires": { - "lodash._escapehtmlchar": "~2.4.1", - "lodash._reunescapedhtml": "~2.4.1", - "lodash.keys": "~2.4.1" - } - }, - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - }, - "lodash.template": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", - "requires": { - "lodash._escapestringchar": "~2.4.1", - "lodash._reinterpolate": "~2.4.1", - "lodash.defaults": "~2.4.1", - "lodash.escape": "~2.4.1", - "lodash.keys": "~2.4.1", - "lodash.templatesettings": "~2.4.1", - "lodash.values": "~2.4.1" - } - }, - "lodash.templatesettings": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", - "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", - "requires": { - "lodash._reinterpolate": "~2.4.1", - "lodash.escape": "~2.4.1" - } - }, - "minimist": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", - "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", - "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", - "requires": { - "readable-stream": "~1.0.17", - "xtend": "~3.0.0" - } - }, - "vinyl": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", - "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", - "requires": { - "clone-stats": "~0.0.1" - } - }, - "xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=" - } - } - }, - "gulp-uglify": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-0.3.2.tgz", - "integrity": "sha1-+je/bUrZopo0nGy6hiq7Iuumeqw=", - "requires": { - "deepmerge": ">=0.2.7 <0.3.0-0", - "gulp-util": ">=3.0.0 <4.0.0-0", - "through2": ">=0.6.1 <1.0.0-0", - "uglify-js": "2.4.6" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "requires": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^2.0.0", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", - "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "requires": { - "glogg": "^1.0.0" - } - }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", @@ -6915,14 +5722,6 @@ "function-bind": "^1.1.1" } }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "requires": { - "ansi-regex": "^0.2.0" - } - }, "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -6961,14 +5760,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "requires": { - "sparkles": "^1.0.0" - } - }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -7132,14 +5923,6 @@ "react-is": "^16.7.0" } }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", @@ -7368,49 +6151,17 @@ "http-errors": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", - "requires": { - "inherits": "~2.0.1", - "statuses": "1" - } - }, - "http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" - }, - "http-proxy": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz", - "integrity": "sha1-FLoM6qIZf4n6MN6p57CeGc2Twi8=", - "requires": { - "colors": "0.x.x", - "optimist": "0.6.x", - "pkginfo": "0.3.x", - "utile": "~0.2.1" - }, - "dependencies": { - "colors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" - }, - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - } + "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", + "requires": { + "inherits": "~2.0.1", + "statuses": "1" } }, + "http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" + }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", @@ -7631,16 +6382,6 @@ } } }, - "i": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz", - "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==" - }, - "iconv-lite": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", - "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4=" - }, "icss-replace-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", @@ -7790,11 +6531,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, "inquirer": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", @@ -7891,11 +6627,6 @@ "side-channel": "^1.0.4" } }, - "interpret": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz", - "integrity": "sha1-CIwl3nMcbFsRKpDwBxz69Fnlp7s=" - }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -7919,15 +6650,6 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -8108,11 +6830,6 @@ "lower-case": "^1.1.0" } }, - "is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" - }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -8225,25 +6942,12 @@ "has-tostringtag": "^1.0.0" } }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, - "is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" - }, "is-shared-array-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", @@ -8284,31 +6988,11 @@ "has-symbols": "^1.0.2" } }, - "is-typed-array": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz", - "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0" - } - }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, "is-upper-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", @@ -8322,11 +7006,6 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, - "is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" - }, "is-weakref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", @@ -8335,11 +7014,6 @@ "call-bind": "^1.0.0" } }, - "is-weakset": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", - "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==" - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -8353,7 +7027,9 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true, + "optional": true }, "isbinaryfile": { "version": "3.0.3", @@ -9138,21 +7814,6 @@ "dev": true, "optional": true }, - "liftoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", - "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", - "requires": { - "extend": "^3.0.0", - "findup-sync": "^2.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" - } - }, "load-grunt-config": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-0.19.2.tgz", @@ -9289,108 +7950,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" - }, - "lodash._escapehtmlchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", - "requires": { - "lodash._htmlescapes": "~2.4.1" - } - }, - "lodash._escapestringchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", - "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=" - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" - }, - "lodash._htmlescapes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", - "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=" - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" - }, - "lodash._isnative": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", - "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=" - }, - "lodash._objecttypes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", - "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=" - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" - }, - "lodash._reunescapedhtml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", - "requires": { - "lodash._htmlescapes": "~2.4.1", - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" - }, - "lodash._shimkeys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", - "requires": { - "lodash._objecttypes": "~2.4.1" - } - }, "lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", @@ -9411,35 +7970,6 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, - "lodash.defaults": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", - "requires": { - "lodash._objecttypes": "~2.4.1", - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "requires": { - "lodash._root": "^3.0.0" - } - }, "lodash.filter": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", @@ -9461,40 +7991,12 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" - }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, - "lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "requires": { - "lodash._objecttypes": "~2.4.1" - } - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, "lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", @@ -9525,11 +8027,6 @@ "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" - }, "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", @@ -9540,31 +8037,6 @@ "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=" }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" - } - }, "lodash.unescape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", @@ -9576,53 +8048,6 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, - "lodash.values": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", - "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", - "requires": { - "lodash.keys": "~2.4.1" - }, - "dependencies": { - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "requires": { - "lodash._isnative": "~2.4.1", - "lodash._shimkeys": "~2.4.1", - "lodash.isobject": "~2.4.1" - } - } - } - }, - "log4js": { - "version": "0.6.38", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", - "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", - "requires": { - "readable-stream": "~1.0.2", - "semver": "~4.3.3" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" - } - } - }, "loggly": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz", @@ -9872,11 +8297,6 @@ "lower-case": "^1.1.2" } }, - "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" - }, "mailcomposer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz", @@ -9935,14 +8355,6 @@ } } }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -9986,16 +8398,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "medium-editor": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/medium-editor/-/medium-editor-5.23.3.tgz", - "integrity": "sha512-he9/TdjX8f8MGdXGfCs8AllrYnqXJJvjNkDKmPg3aPW/uoIrlRqtkFthrwvmd+u4QyzEiadhCCM0EwTiRdUCJw==" - }, - "medium-editor-tables": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/medium-editor-tables/-/medium-editor-tables-0.6.1.tgz", - "integrity": "sha1-CKWZgvYdI4kp4S/hiszCMGLpbPM=" - }, "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", @@ -10083,37 +8485,6 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, - "method-override": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz", - "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=", - "requires": { - "debug": "2.6.9", - "methods": "~1.1.2", - "parseurl": "~1.3.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" - } - } - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -10268,33 +8639,6 @@ "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==", "dev": true }, - "morgan": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", - "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=", - "requires": { - "basic-auth": "~1.0.3", - "debug": "~2.2.0", - "depd": "~1.0.1", - "on-finished": "~2.3.0", - "on-headers": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - } - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10325,33 +8669,11 @@ "minimatch": "^3.0.0" } }, - "multiparty": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", - "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8=", - "requires": { - "readable-stream": "~1.1.9", - "stream-counter": "~0.2.0" - } - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "requires": { - "duplexer2": "0.0.2" - } - }, "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, - "nan": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", - "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=" - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -10370,11 +8692,6 @@ "to-regex": "^3.0.1" } }, - "natives": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", - "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -10388,11 +8705,6 @@ "xml-char-classes": "^1.0.0" } }, - "ncp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", - "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=" - }, "nearley": { "version": "2.20.1", "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", @@ -10935,11 +9247,6 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" - }, "object-component": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", @@ -11012,17 +9319,6 @@ "object-keys": "^1.1.1" } }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, "object.entries": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", @@ -11043,15 +9339,6 @@ "es-abstract": "^1.19.1" } }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -11131,14 +9418,6 @@ "is-wsl": "^1.1.0" } }, - "optimist": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", - "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", - "requires": { - "wordwrap": "~0.0.2" - } - }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -11152,26 +9431,6 @@ "word-wrap": "~1.2.3" } }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=" - }, - "orchestrator": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", - "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", - "requires": { - "end-of-stream": "~0.1.5", - "sequencify": "~0.0.7", - "stream-consume": "~0.1.0" - } - }, - "ordered-read-streams": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", - "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" - }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -11391,16 +9650,6 @@ "safe-buffer": "^5.1.1" } }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -11435,16 +9684,6 @@ "error-ex": "^1.2.0" } }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" - }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -11617,20 +9856,7 @@ "dev": true, "optional": true } - } - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + } }, "path-to-regexp": { "version": "0.1.7", @@ -11654,11 +9880,6 @@ } } }, - "pause": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", - "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q=" - }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", @@ -11726,11 +9947,6 @@ "find-up": "^1.0.0" } }, - "pkginfo": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", - "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=" - }, "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", @@ -11751,11 +9967,6 @@ "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.11.tgz", "integrity": "sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg==" }, - "policyfile": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz", - "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0=" - }, "popper.js": { "version": "1.14.4", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", @@ -12377,11 +10588,6 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, - "pretty-hrtime": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz", - "integrity": "sha1-1P2INR46R0H4Fzr31qS4RvmJXAA=" - }, "primeicons": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-2.0.0.tgz", @@ -12598,11 +10804,6 @@ "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", "dev": true }, - "qs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", - "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=" - }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", @@ -12659,11 +10860,6 @@ "ret": "~0.1.10" } }, - "random-bytes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", - "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -12713,28 +10909,6 @@ "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.22.3.tgz", "integrity": "sha512-pIzHpAggyTOGJE3ruAKdZNK5qhO4V21kR7lwpdUM875yHpq1cqeGzvs78/RufF3g7NaAvVmMPCbaV9uUhQzJ3A==" }, - "raw-body": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", - "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=", - "requires": { - "bytes": "2.4.0", - "iconv-lite": "0.4.13", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", - "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=" - }, - "iconv-lite": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=" - } - } - }, "react": { "version": "16.9.0", "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", @@ -13054,6 +11228,8 @@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -13140,12 +11316,6 @@ "strip-indent": "^1.0.1" } }, - "redis": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz", - "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=", - "optional": true - }, "redis-commands": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", @@ -13309,11 +11479,6 @@ "is-finite": "^1.0.0" } }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" - }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -13431,15 +11596,6 @@ } } }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -13465,22 +11621,6 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, - "response-time": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", - "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", - "requires": { - "depd": "~1.1.0", - "on-headers": "~1.0.1" - }, - "dependencies": { - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - } - } - }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -13520,11 +11660,6 @@ "inherits": "^2.0.1" } }, - "rndm": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", - "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" - }, "rst-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", @@ -13792,55 +11927,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "send": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", - "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=", - "requires": { - "debug": "~2.2.0", - "depd": "~1.1.0", - "destroy": "~1.0.4", - "escape-html": "~1.0.3", - "etag": "~1.7.0", - "fresh": "0.3.0", - "http-errors": "~1.3.1", - "mime": "1.3.4", - "ms": "0.7.1", - "on-finished": "~2.3.0", - "range-parser": "~1.0.3", - "statuses": "~1.2.1" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "requires": { - "ms": "0.7.1" - } - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" - }, - "statuses": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg=" - } - } - }, "sentence-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", @@ -13850,29 +11936,6 @@ "upper-case-first": "^1.1.2" } }, - "sequencify": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", - "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" - }, - "serve-favicon": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz", - "integrity": "sha1-3UGeJo3gEqtysxnTN/IQUBP5OB8=", - "requires": { - "etag": "~1.7.0", - "fresh": "0.3.0", - "ms": "0.7.2", - "parseurl": "~1.3.1" - }, - "dependencies": { - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=" - } - } - }, "serve-index": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz", @@ -13902,16 +11965,6 @@ } } }, - "serve-static": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", - "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=", - "requires": { - "escape-html": "~1.0.3", - "parseurl": "~1.3.1", - "send": "0.13.2" - } - }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -14028,11 +12081,6 @@ "object-inspect": "^1.9.0" } }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" - }, "signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -14224,41 +12272,12 @@ "hoek": "2.x.x" } }, - "socket.io": { - "version": "0.9.16", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", - "integrity": "sha1-O6sEROSbVfu8FXQk29Qao3WlGnY=", - "requires": { - "base64id": "0.1.0", - "policyfile": "0.0.4", - "redis": "0.7.3", - "socket.io-client": "0.9.16" - } - }, "socket.io-adapter": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", "dev": true }, - "socket.io-client": { - "version": "0.9.16", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz", - "integrity": "sha1-TadRXF53MEHRtCOXBBW8xDDzX8Y=", - "requires": { - "active-x-obfuscator": "0.0.1", - "uglify-js": "1.2.5", - "ws": "0.4.x", - "xmlhttprequest": "1.4.2" - }, - "dependencies": { - "uglify-js": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", - "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY=" - } - } - }, "socket.io-parser": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz", @@ -14421,11 +12440,6 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, - "sparkles": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", - "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" - }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -14666,19 +12680,6 @@ } } }, - "stream-consume": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", - "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" - }, - "stream-counter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", - "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=", - "requires": { - "readable-stream": "~1.1.8" - } - }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", @@ -14835,7 +12836,9 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true, + "optional": true }, "stringstream": { "version": "0.0.6", @@ -14844,23 +12847,6 @@ "dev": true, "optional": true }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "requires": { - "ansi-regex": "^0.2.1" - } - }, - "strip-bom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", - "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", - "requires": { - "first-chunk-stream": "^1.0.0", - "is-utf8": "^0.2.0" - } - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -15412,11 +13398,6 @@ } } }, - "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" - }, "svgo": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", @@ -15523,44 +13504,6 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "thunkify": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", @@ -15573,19 +13516,6 @@ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, - "tildify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", - "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", - "requires": { - "os-homedir": "^1.0.0" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" - }, "timers-browserify": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", @@ -15601,11 +13531,6 @@ "dev": true, "optional": true }, - "tinycolor": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", - "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=" - }, "title-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", @@ -15827,7 +13752,9 @@ "tsscmp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=" + "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=", + "dev": true, + "optional": true }, "tsutils": { "version": "3.21.0", @@ -15924,27 +13851,6 @@ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==" }, - "uglify-js": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz", - "integrity": "sha1-MXZqTYIrq/XzLBQJYlHtklkpitM=", - "requires": { - "async": "~0.2.6", - "optimist": "~0.3.5", - "source-map": "~0.1.7", - "uglify-to-browserify": "~1.0.0" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "uglify-to-browserify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", @@ -15972,14 +13878,6 @@ } } }, - "uid-safe": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz", - "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=", - "requires": { - "random-bytes": "~1.0.0" - } - }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -15997,11 +13895,6 @@ "which-boxed-primitive": "^1.0.2" } }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, "uncontrollable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz", @@ -16041,11 +13934,6 @@ "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, - "unique-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", - "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -16163,31 +14051,6 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" - }, - "useragent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", - "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - } - } - }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -16208,24 +14071,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "utile": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", - "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", - "requires": { - "async": "~0.2.9", - "deep-equal": "*", - "i": "0.3.x", - "mkdirp": "0.x.x", - "ncp": "0.4.x", - "rimraf": "2.x.x" - } - }, - "utils-merge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" - }, "uuid": { "version": "8.3.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", @@ -16243,14 +14088,6 @@ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" }, - "v8flags": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", - "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", - "requires": { - "user-home": "^1.1.1" - } - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16287,72 +14124,6 @@ } } }, - "vhost": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", - "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=" - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "requires": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" - } - }, - "vinyl-fs": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", - "requires": { - "defaults": "^1.0.0", - "glob-stream": "^3.1.5", - "glob-watcher": "^0.0.6", - "graceful-fs": "^3.0.0", - "mkdirp": "^0.5.0", - "strip-bom": "^1.0.0", - "through2": "^0.6.1", - "vinyl": "^0.4.0" - }, - "dependencies": { - "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "requires": { - "readable-stream": ">=1.0.33-1 <1.1.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - }, - "vinyl": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", - "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", - "requires": { - "clone": "^0.2.0", - "clone-stats": "^0.0.1" - } - } - } - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -17117,35 +14888,11 @@ "is-symbol": "^1.0.3" } }, - "which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "requires": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - } - }, "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, - "which-typed-array": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz", - "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==", - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-abstract": "^1.18.5", - "foreach": "^2.0.5", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.7" - } - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -17203,7 +14950,8 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true }, "wrap-ansi": { "version": "2.1.0", @@ -17260,27 +15008,11 @@ "mkdirp": "^0.5.1" } }, - "ws": { - "version": "0.4.32", - "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", - "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", - "requires": { - "commander": "~2.1.0", - "nan": "~1.0.0", - "options": ">=0.0.5", - "tinycolor": "0.x" - } - }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=" }, - "xmlhttprequest": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz", - "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA=" - }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", @@ -17348,11 +15080,6 @@ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true - }, - "zeparser": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz", - "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI=" } } } diff --git a/package.json b/package.json index 62baf5ddda..c027ce2121 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,6 @@ "angular": "1.6.9", "angular-contenteditable": "0.3.9", "angular-dynamic-locale": "0.1.32", - "angular-embed": "github:superdesk/angular-embed#d75968e", - "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", @@ -88,8 +86,6 @@ "load-grunt-config": "0.19.2", "load-grunt-tasks": "3.5.2", "lodash": "4.17.19", - "medium-editor": "5.23.3", - "medium-editor-tables": "0.6.1", "ment.io": "0.9.23", "moment": "2.20.1", "moment-timezone": "0.5.14", diff --git a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts index 0798f30a7c..ce49964fe8 100644 --- a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts +++ b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts @@ -147,15 +147,6 @@ export function ArticleEditDirective( } }); - // watch item and save every change in history in order to perform undo/redo later - // ONLY for editor2 (with blocks) - try { - angular.module('superdesk.apps.editor2'); - history.watch('item', mainEditScope || scope); - } catch (e) { - // no-op - } - scope.$on('History.undone', triggerAutosave); scope.$on('History.redone', triggerAutosave); diff --git a/scripts/apps/authoring/authoring/services/HistoryFactory.ts b/scripts/apps/authoring/authoring/services/HistoryFactory.ts index 59252c13c3..7a96a8450b 100644 --- a/scripts/apps/authoring/authoring/services/HistoryFactory.ts +++ b/scripts/apps/authoring/authoring/services/HistoryFactory.ts @@ -23,14 +23,7 @@ export function HistoryFactory(History, $window, $timeout) { }; var onHistoryKeydown = function(event) { onHistoryKey(event, () => { - const editor2FieldsExist = document.querySelector('[sd-text-editor]') != null; - - if (editor2FieldsExist) { - // preventing default generally breaks undo via ctrl+z for native inputs/textareas, - // but is required for editor2 - event.preventDefault(); - } - // action is on keydown becuase command key (event.metakey) on OSX is not detected on keyup events + // action is on keydown because command key (event.metakey) on OSX is not detected on keyup events // for some reason. scope.$apply(() => { KeyOperations[event.keyCode].bind(History)(expression, scope); diff --git a/scripts/apps/authoring/macros/macros.spec.ts b/scripts/apps/authoring/macros/macros.spec.ts index 0af3c777a1..d142df5754 100644 --- a/scripts/apps/authoring/macros/macros.spec.ts +++ b/scripts/apps/authoring/macros/macros.spec.ts @@ -25,7 +25,6 @@ describe('macros', () => { }, ]; - beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); @@ -39,7 +38,6 @@ describe('macros', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.apps.authoring.macros')); beforeEach(window.module('superdesk.apps.authoring.autosave')); diff --git a/scripts/apps/authoring/styles/authoring.scss b/scripts/apps/authoring/styles/authoring.scss index 5f93c57810..0b65f16916 100644 --- a/scripts/apps/authoring/styles/authoring.scss +++ b/scripts/apps/authoring/styles/authoring.scss @@ -140,59 +140,6 @@ bottom: 32px; } - -// Medium editor -// ------------------------------------------------- -.medium-editor-toolbar-actions { - li button { - height: 30px !important; - min-width: 40px !important; - padding-top: 10px !important; - } -} -.medium-toolbar-arrow-under:after { - top: 40px !important; -} - -.text-editor-info { - font-size: 89%; -} - -.text-editor, .text-editor.medium-editor-element { - min-height: 20px; - - .sderror { - border-bottom: 1px dotted #cc0000; - background-color: rgba(204,0,0,0.1); - line-height: normal; - } - - .sdfindreplace { - background-color: rgba(0,0,0,0.1); - } - - .sdfindreplace.sdactive { - background-color: rgba(255,230,0,1); - } - - a { - color: #5d9bc0; - } -} - -.typing { - .text-editor { - .sderror, .typing .sdfindreplace { - border-bottom: none; - background-color: transparent; - } - - &.clone { - display: none; - } - } -} - // Placeholders // ------------------------------------------------- [contenteditable=true] { diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index 3fb3c3f44c..feb1c28818 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -13,7 +13,6 @@ describe('authoring', () => { $provide.constant('lodash', _); })); - beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); @@ -27,7 +26,6 @@ describe('authoring', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.apps.extension-points')); beforeEach(window.module('superdesk.apps.spellcheck')); @@ -636,7 +634,6 @@ describe('Item Crops directive', () => { beforeEach(window.module('superdesk.apps.vocabularies')); beforeEach(window.module('superdesk.apps.searchProviders')); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); it('showCrops return true if image renditions are present', inject(($rootScope, $compile, $q, metadata, vocabularies) => { @@ -2209,14 +2206,12 @@ describe('send item directive', () => { server: {url: undefined, ws: undefined}, iframely: {key: '123'}, editor: {}, - features: {onlyEditor3: false}, }; Object.assign(appConfig, testConfig); }); beforeEach(window.module('superdesk.core.editor3')); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.authoring')); beforeEach(window.module('superdesk.templates-cache')); @@ -2428,7 +2423,7 @@ describe('send item directive', () => { _id: 'New Stage', name: 'new stage', }; - beforeEach(inject(($q, $compile, $rootScope, api, editor) => { + beforeEach(inject(($q, $compile, $rootScope, api) => { spyOn(api, 'find').and.returnValue($q.when({})); spyOn(api, 'save').and.returnValue($q.when({task: {desk: 'new', stage: 'new'}})); diff --git a/scripts/apps/authoring/views/article-edit.html b/scripts/apps/authoring/views/article-edit.html index 107680b724..acc9df5d7e 100644 --- a/scripts/apps/authoring/views/article-edit.html +++ b/scripts/apps/authoring/views/article-edit.html @@ -16,33 +16,7 @@
- - - - - - -
-
- -
- - - - -
-
-
- -
-
- - - - - -
-
-
-
-
- - - - -
-
{{item.description_text}}
-
- -
- -
-
-
- -
@@ -870,7 +750,7 @@
- -
- -
-
-
diff --git a/scripts/core/editor2/add-content.ts b/scripts/core/editor2/add-content.ts deleted file mode 100644 index bd6739e095..0000000000 --- a/scripts/core/editor2/add-content.ts +++ /dev/null @@ -1,146 +0,0 @@ -import {appConfig} from 'appConfig'; - -angular.module('superdesk.apps.editor2.content', []).directive('sdAddContent', ['$window', - function($window) { - return { - // the scope is not isolated because we require the medium instance - controller: AddContentCtrl, - require: ['sdAddContent', '^sdTextEditorBlockText', '^sdTextEditor'], - templateUrl: 'scripts/core/editor2/views/add-content.html', - controllerAs: 'vm', - bindToController: true, - link: function(scope, element, attrs, ctrls) { - var vm = ctrls[0]; - - angular.extend(vm, { - textBlockCtrl: ctrls[1], - sdEditorCtrl: ctrls[2], - }); - if (!vm.config.embeds) { - return; - } - // initialize state - vm.updateState(); - // listen for update state signals - var unbindListener = scope.$parent.$on('sdAddContent::updateState', - (signal, event, editorElem) => { - vm.updateState(event, editorElem); - }); - // update on resize - - angular.element($window).on('resize', vm.updateState); - scope.$on('$destroy', () => { - angular.element($window).off('resize', vm.updateState); - unbindListener(); - }); - }, - }; - }]); - -AddContentCtrl.$inject = ['$scope', '$element', 'superdesk', 'editor', '$timeout', '$q']; -function AddContentCtrl(scope, element, superdesk, editor, $timeout, $q) { - var elementHolder = element.find('div:first-child').first(); - var self = this; - - /** Return true if the event come from this directive's element */ - function elementContainsEventTarget(event) { - if (!angular.isDefined(event)) { - return false; - } - return $.contains(element.get(0), event.target); - } - - angular.extend(self, { - expanded: false, - config: angular.extend({embeds: true}, appConfig.editor || {}), // should be on by default - // update the (+) vertical position on the left and his visibility (hidden/shown) - updateState: function(event, editorElem) { - // hide if medium is not defined yett (can happen at initialization) or - // hide if the text input is not selected and if it was not a click on the (+) button - if (!angular.isDefined(scope.medium) - || !angular.element(editorElem).is(':focus') && !elementContainsEventTarget(event)) { - return self.hide(); - } - - var currentParagraph; - - try { - currentParagraph = angular.element(scope.medium.getSelectedParentElement()); - } catch (e) { - return; - } - var position = currentParagraph.position().top; - // move the (+) button at the caret position - - elementHolder.css('top', position > 0 ? position : 0); - // handle resize: Do nothing, only positioning was needed - if (event && event.type === 'resize') { - return; - } - - const isFocusEvent = event && event.type === 'focus'; - const isClickEvent = event && event.type === 'click'; - const containsTarget = elementContainsEventTarget(event) && currentParagraph.text() === ''; - const isFocused = editorElem.is(':focus') && currentParagraph.text() === ''; - const isEmptyLine = currentParagraph.text() === ''; - const shouldShow = isFocusEvent && containsTarget || isClickEvent && isFocused || isEmptyLine; - - return shouldShow ? self.show() : self.hide(); - }, - hide: function() { - $timeout(() => { - elementHolder.css({ - display: 'none', - }); - self.expanded = false; - }); - }, - show: function() { - $timeout(() => { - elementHolder.css({ - display: 'block', - }); - }); - }, - toogleExpand: function() { - self.expanded = !self.expanded; - }, - isSomethingInClipboard: function() { - return angular.isDefined(self.sdEditorCtrl.getCutBlock()); - }, - triggerAction: function(action) { - self.hide(); - self.actions[action](); - }, - actions: { - addEmbed: function() { - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl).then(() => { - // show the add-embed form - self.textBlockCtrl.block.showAndFocusLowerAddAnEmbedBox(); - }); - }, - addPicture: function() { - superdesk.intent('upload', 'media', {uniqueUpload: true}).then((images) => { - $q.all(images.map((image) => editor.generateMediaTag(image).then((imgTag) => ({ - blockType: 'embed', - embedType: 'Image', - body: imgTag, - caption: image.description_text, - association: image, - })))).then((renderedImages) => { - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl, renderedImages); - }); - }, () => { - scope.node.focus(); - self.textBlockCtrl.restoreSelection(); - }); - }, - pasteBlock: function() { - if (!self.sdEditorCtrl.getCutBlock()) { - return false; - } - self.sdEditorCtrl.splitAndInsert(self.textBlockCtrl, self.sdEditorCtrl.getCutBlock(true)); - }, - }, - }); -} diff --git a/scripts/core/editor2/add-embed.ctrl.ts b/scripts/core/editor2/add-embed.ctrl.ts deleted file mode 100644 index 27b94711b8..0000000000 --- a/scripts/core/editor2/add-embed.ctrl.ts +++ /dev/null @@ -1,133 +0,0 @@ -import embedCodeHandlers from './embedCodeHandlers'; - -angular.module('superdesk.apps.editor2.embed', []).controller('SdAddEmbedController', SdAddEmbedController); - -SdAddEmbedController.$inject = ['embedService', '$element', '$timeout', '$q', 'lodash', - 'EMBED_PROVIDERS', '$scope', 'editor', '$injector']; -function SdAddEmbedController(embedService, $element, $timeout, $q, _, - EMBED_PROVIDERS, $scope, editor, $injector) { - var self = this; - - angular.extend(self, { - editorCtrl: undefined, // defined in link method - previewLoading: false, - toggle: function(close) { - // use parameter or toggle - self.extended = angular.isDefined(close) ? !close : !self.extended; - }, - retrieveEmbed: function() { - function retrieveEmbedFromUrl() { - return embedService.get(self.input).then((data) => { - var embed = data.html; - - if (!angular.isDefined(embed)) { - if (data.type === 'link') { - embed = editor.generateLinkTag({ - url: data.url, - title: data.meta.title, - description: data.meta.description, - illustration: data.thumbnail_url, - }); - } else { - embed = editor.generateMediaTag({url: data.url, altText: data.description}); - } - } - return $q.when(embed).then((embedElement) => ({ - body: embedElement, - provider: data.provider_name || EMBED_PROVIDERS.custom, - })); - }); - } - function parseRawEmbedCode() { - var waitFor = []; - var embedBlock = { - body: self.input, - provider: EMBED_PROVIDERS.custom, - }; - - function updateEmbedBlock(partialUpdate) { - angular.extend(embedBlock, partialUpdate); - } - // try to guess the provider of the custom embed - for (var i = 0; i < embedCodeHandlers.length; i++) { - var provider = $injector.invoke(embedCodeHandlers[i]); - - if (angular.isDefined(provider.condition)) { - if (!provider.condition()) { - continue; - } - } - var match = provider.pattern.exec(self.input); - - if (match) { - updateEmbedBlock({provider: provider.name}); - if (provider.callback) { - waitFor.push(provider.callback(match).then(updateEmbedBlock)); - } - break; - } - } - return $q.all(waitFor).then(() => embedBlock); - } - var embedCode; - // if it's an url, use embedService to retrieve the embed code - - if (_.startsWith(self.input, 'http')) { - embedCode = retrieveEmbedFromUrl(); - // otherwise we use the content of the field directly - } else { - embedCode = parseRawEmbedCode(); - } - return $q.when(embedCode); - }, - updatePreview: function() { - self.previewLoading = true; - self.retrieveEmbed().then((embed) => { - angular.element($element) - .find('.preview') - .html(embed.body.replace('\\n', '')); - self.previewLoading = false; - }); - }, - createFigureBlock: function(data) { - // create a new block containing the embed - data.blockType = 'embed'; - return self.editorCtrl.insertNewBlock(self.addToPosition, data); - }, - createBlockFromEmbed: function() { - self.retrieveEmbed().then((embed) => { - self.createFigureBlock({ - embedType: embed.provider, - body: embed.body, - association: embed.association, - }); - // close the addEmbed form - self.toggle(true); - }); - }, - closeEmbed: function() { - // put block back together on embed form close. - self.toggle(); - }, - }); - - // toggle when the `extended` directive attribute changes - $scope.$watch(() => self.extended, (extended, wasExtended) => { - // on enter, focus on input - if (angular.isDefined(extended)) { - if (extended) { - $timeout(() => { - angular.element($element) - .find('input') - .focus(); - }, 500, false); // positive timeout because of a chrome issue - // on leave, clear field - } else if (wasExtended) { - self.input = ''; - if (typeof self.onClose === 'function') { - $timeout(self.onClose); - } - } - } - }); -} diff --git a/scripts/core/editor2/customAnchor.ts b/scripts/core/editor2/customAnchor.ts deleted file mode 100644 index ad0533322c..0000000000 --- a/scripts/core/editor2/customAnchor.ts +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This module extends (and overrides) MediumEditor's anchor button to disallow - * malformed URLs when the 'linkValidation: true' option is set. - * - * It additionally introduces the possibility to set the validation pattern - * using the 'pattern' option when configuring the editor. - */ -import MediumEditor from 'medium-editor'; - -class CustomAnchorButton extends MediumEditor.extensions.anchor { - linkValidation: any; - pattern: any; - getForm: any; - - createForm() { - let form = super.createForm(); - - if (!this.linkValidation) { - return form; - } - - let input = form.getElementsByTagName('input')[0]; - - input.setAttribute('type', 'url'); - input.setAttribute('required', ''); - if (this.pattern) { - input.setAttribute('pattern', this.pattern); - } - - return form; - } - - doFormSave() { - let input = this.getForm().getElementsByTagName('input')[0]; - - // prevent double encoding; medium editor don't detect if the url is already encoded - input.value = decodeURIComponent(input.value); - - let isValid = input.checkValidity(); - - if (isValid) { - super.doFormSave(); - } - } -} - -// override default anchor -MediumEditor.extensions.anchor = CustomAnchorButton; diff --git a/scripts/core/editor2/editor.ctrl.ts b/scripts/core/editor2/editor.ctrl.ts deleted file mode 100644 index 6e8cd03149..0000000000 --- a/scripts/core/editor2/editor.ctrl.ts +++ /dev/null @@ -1,401 +0,0 @@ -import {appConfig} from 'appConfig'; - -angular.module('superdesk.apps.editor2.ctrl', []).controller('SdTextEditorController', SdTextEditorController); - -SdTextEditorController.$inject = ['lodash', 'EMBED_PROVIDERS', '$timeout', 'editor', '$q']; -function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, $q) { - var self = this; - - function Block(attrs: any = {}) { - // eslint-disable-next-line consistent-this - var BlockFnThis = this; - - angular.extend(BlockFnThis, _.defaults({ - body: attrs.body, - loading: attrs.loading, - caption: attrs.caption, - blockType: attrs.blockType, - embedType: attrs.embedType, - association: attrs.association, - lowerAddEmbedIsExtended: undefined, - showAndFocusLowerAddAnEmbedBox: function() { - BlockFnThis.lowerAddEmbedIsExtended = true; - }, - }, { - body: '


', - loading: false, - blockType: 'text', - })); - } - /** - * For the given blocks, merge text blocks when there are following each other - * and add empty text block arround embeds if needed - */ - function prepareBlocks(blocks) { - var newBlocks = []; - - blocks.forEach((block, i) => { - // if not the first block and there is a text block following another one - if (i > 0 && block.blockType === 'text' && blocks[i - 1].blockType === 'text') { - // we merge the content with the previous block - newBlocks[newBlocks.length - 1].body += block.body; - } else { - // otherwise we add the full block - newBlocks.push(block); - } - // add emtpy text block if block is between 2 embed blocks or at the end - if (blocks[i].blockType === 'embed') { - if (i === blocks.length - 1 || blocks[i + 1].blockType === 'embed') { - newBlocks.push(new Block()); - } - } - }); - // add emtpy text block at the top if needed - if (newBlocks[0].blockType === 'embed') { - newBlocks.unshift(new Block()); - } - return newBlocks; - } - function splitIntoBlock(bodyHtml) { - var blocks = [], block; - /** - * push the current block into the blocks collection if it is not empty - */ - - function commitBlock() { - if (block !== undefined && block.body.trim() !== '') { - blocks.push(block); - block = undefined; - } - } - - function handleParagraph(element) { - commitBlock(); - if (angular.isDefined(element.innerHTML) && element.textContent !== '' - && element.textContent !== '\n') { - blocks.push(new Block({body: element.outerHTML.trim()})); - } - } - - $('
' + bodyHtml + '
') - .contents() - .toArray() - .forEach((element) => { - // if we get a

, we push the current block and create a new one - // for the paragraph content - if (element.nodeName === 'P') { - handleParagraph(element); - // detect if it's an embed - } else if (element.nodeName === '#comment') { - if (element.nodeValue.indexOf('EMBED START') > -1) { - commitBlock(); - // retrieve the embed type following the comment - var embedType; - var embedTypeRegex = /EMBED START ([\w-]+)/; - var match; - - if ((match = embedTypeRegex.exec(angular.copy(element.nodeValue).trim())) !== null) { - embedType = match[1]; - } else { - embedType = EMBED_PROVIDERS.custom; - } - // retrieve the association reference - var association; - var embedAssoKey = /{id: "(embedded\d+)"}/; - - if ((match = embedAssoKey.exec(angular.copy(element.nodeValue).trim())) !== null - && self.associations) { - association = angular.copy(self.associations[match[1]]); - } - // create the embed block - block = new Block({ - blockType: 'embed', - embedType: embedType, - association: association, - body: '', - }); - } - if (element.nodeValue.indexOf('EMBED END') > -1) { - commitBlock(); - } - // if it's not a paragraph or an embed, we update the current block - } else { - if (block === undefined) { - block = new Block({body: ''}); - } - // we want the outerHTML (ex: 'text') or the node value for text and comment - block.body += (element.outerHTML || element.nodeValue || '').trim(); - } - }); - // at the end of the loop, we push the last current block - if (block !== undefined && block.body.trim() !== '') { - blocks.push(block); - } - // Complete embeds with metadata (from association datadata or html) - blocks.forEach((blockObject) => { - if (blockObject.blockType === 'embed') { - // for images that come from Superdesk, we use the association - if (blockObject.association && blockObject.embedType === 'Image') { - blockObject.caption = blockObject.association.description_text; - blockObject.body = ''; - editor.generateMediaTag(blockObject.association).then((img) => { - blockObject.body = img; - }); - } else { - // extract body and caption from embed blockObject html - var originalBody = angular.element(angular.copy(blockObject.body)); - - if (originalBody.get(0).nodeName === 'FIGURE') { - blockObject.body = ''; - originalBody.contents() - .toArray() - .forEach((element) => { - if (element.nodeName === 'FIGCAPTION') { - blockObject.caption = element.innerHTML; - } else { - blockObject.body += element.outerHTML || element.nodeValue || ''; - } - }); - } - } - } - }); - // if no block, create an empty one to start - if (blocks.length === 0) { - blocks.push(new Block()); - } - return blocks; - } - angular.extend(self, { - configuration: angular.extend({embeds: true}, appConfig.editor || {}), - blocks: [], - initEditorWithOneBlock: function(model) { - self.model = model; - self.blocks = [new Block({body: model.$modelValue})]; - }, - initEditorWithMultipleBlock: function(model) { - // save the model to update it later - self.model = model; - // parse the given model and create blocks per paragraph and embed - var content = model.$modelValue || ''; - // update the actual blocks value at the end to prevent more digest cycle as needed - - self.blocks = splitIntoBlock(content); - self.renderBlocks(); - }, - serializeBlock: function(blocks = self.blocks) { - // in case blocks are not ready - if (blocks.length === 0) { - return ''; - } - var newBody = ''; - - if (self.config.multiBlockEdition) { - blocks.forEach((block) => { - if (angular.isDefined(block.body) && block.body.trim() !== '') { - if (block.blockType === 'embed') { - var blockName = block.embedType.trim(); - // add an id to the image in order to retrieve it in `assocations` field - - if (block.association) { - blockName += ' {id: "embedded' + self.generateBlockId(block) + '"}'; - } - newBody += [ - '\n', - '

', - block.body, - '
', - block.caption, - '
', - '
', - '\n\n'].join(''); - } else { - newBody += block.body + '\n'; - } - } - }); - } else { - newBody = blocks.length > 0 && typeof blocks[0].body === 'string' ? blocks[0].body : ''; - } - // strip
and

- newBody = newBody.trim().replace(/


<\/p>$/, ''); - newBody = newBody.replace(/
$/, ''); - return newBody; - }, - commitChanges: function() { - var associations = angular.copy(self.associations); - // initialize associations if doesn't exist - - if (typeof associations !== 'object') { - associations = {}; - } - // remove older associations - angular.forEach(associations, (value, key) => { - if (_.startsWith(key, 'embedded')) { - associations[key] = null; - } - }); - - if (Object.keys(associations).length || self.associations) { - // update associations with the ones stored in blocks - self.associations = angular.extend({}, associations, self.getAssociations()); - } - - // save model with latest state of blocks - var serialized = self.serializeBlock(); - - if (serialized !== self.model.$viewValue) { - self.model.$setViewValue(serialized); - } - }, - /** - * Return an object that contains the embedded images in the story - */ - getAssociations: function() { - var association = {}; - - self.blocks.forEach((block) => { - // we keep the association only for Superdesk images - if (block.association) { - // add the association - association['embedded' + self.generateBlockId(block)] = angular.copy(block.association); - } - }); - return association; - }, - getBlockPosition: function(block) { - return _.indexOf(self.blocks, block); - }, - splitAndInsert: function(textBlockCtrl, blocksToInsert) { - // index where to add the new block - var index = self.getBlockPosition(textBlockCtrl.block) + 1; - - if (index === 0) { - throw new Error('Block to split not found'); - } - // cut the text that is after the caret in the block and save it in order to add it after the embed later - var after = textBlockCtrl.extractEndOfBlock().innerHTML; - - return $q.when((function() { - if (after) { - // save the blocks (with removed leading text) - textBlockCtrl.updateModel(); - // add new text block for the remaining text - return self.insertNewBlock(index, { - body: after, - }, true); - } - })()).then(() => { - if (angular.isDefined(blocksToInsert)) { - var isArray = true; - var arrayBlocks = blocksToInsert; - - if (!angular.isArray(arrayBlocks)) { - isArray = false; - arrayBlocks = [arrayBlocks]; - } - var waitFor = $q.when(); - var createdBlocks = []; - - arrayBlocks.forEach((bti) => { - waitFor = waitFor.then(() => { - var newBlock = self.insertNewBlock(index, bti); - - createdBlocks.push(newBlock); - return newBlock; - }); - }); - return waitFor.then(() => { - if (isArray) { - return $q.all(createdBlocks); - } - - return createdBlocks[0]; - }); - } - }); - }, - /** - ** Merge text blocks when there are following each other and add empty text block arround embeds if needed - ** @param {Integer} position - ** @param {Object} block ; block attributes - ** @param {boolean} doNotRenderBlocks ; if true, it won't merge text blocks and - ** add empty text block if needed through the `renderBlocks()` function. - ** @returns {object} this - */ - insertNewBlock: function(position, attrs, doNotRenderBlocks) { - var newBlock = new Block(attrs); - - return $q((resolve) => { - $timeout(() => { - self.blocks.splice(position, 0, newBlock); - $timeout(() => { - self.commitChanges(); - if (!doNotRenderBlocks) { - $timeout(() => { - self.renderBlocks(); - resolve(newBlock); - }, 0, false); - } else { - resolve(newBlock); - } - }, 0, false); - }); - }); - }, - /** - * Merge text blocks when there are following each other and add empty text block arround embeds if needed - */ - renderBlocks: function() { - self.blocks = prepareBlocks(self.blocks); - }, - removeBlock: function(block) { - // remove block only if it's not the only one - var blockPosition = self.getBlockPosition(block); - - if (self.blocks.length > 1) { - self.blocks.splice(blockPosition, 1); - } else { - // if it's the first block, just remove the content - block.body = ''; - } - self.renderBlocks(); - return $timeout(self.commitChanges); - }, - clipboard: undefined, - cutBlock: function(block) { - self.clipboard = angular.copy(block); - return self.removeBlock(block); - }, - getCutBlock: function(remove) { - var block = self.clipboard; - - if (remove) { - self.clipboard = undefined; - } - return block; - }, - /** - * Compute an id for the block with its content and its position. - * Used as `track by` value, it allows the blocks to be well rendered. - */ - generateBlockId: function(block) { - function hashCode(string) { - var hash = 0, i, chr, len; - - if (string.length === 0) { - return hash; - } - for (i = 0, len = string.length; i < len; i++) { - chr = string.charCodeAt(i); - // tslint:disable-next-line:no-bitwise - hash = (hash << 5) - hash + chr; - // tslint:disable-next-line:no-bitwise - hash |= 0; // Convert to 32bit integer - } - return hash; - } - return String(Math.abs(hashCode(block.body))) + String(self.getBlockPosition(block)); - }, - }); -} diff --git a/scripts/core/editor2/editor.spec.ts b/scripts/core/editor2/editor.spec.ts deleted file mode 100644 index 400c9a2806..0000000000 --- a/scripts/core/editor2/editor.spec.ts +++ /dev/null @@ -1,165 +0,0 @@ -import {ISuperdeskGlobalConfig} from 'superdesk-api'; -import {appConfig} from 'appConfig'; - -describe('text editor', () => { - beforeEach(() => { - const testConfig: Partial = { - server: {url: undefined, ws: undefined}, - iframely: {key: '123'}, - }; - - Object.assign(appConfig, testConfig); - }); - - beforeEach(window.module('superdesk.apps.publish')); - beforeEach(window.module('superdesk.config')); - beforeEach(window.module('superdesk.apps.editor2')); - beforeEach(window.module('superdesk.apps.spellcheck')); - beforeEach(window.module('superdesk.apps.vocabularies')); - beforeEach(window.module('superdesk.apps.searchProviders')); - - beforeEach(() => { - // remove all elements from body - document.body = document.createElement('body'); - }); - - function createScope(text, $rootScope) { - var scope = $rootScope.$new(); - - scope.node = document.createElement('p'); - scope.node.innerHTML = text; - scope.model = { - $viewValue: text, - $setViewValue: function(value) { - this.$viewValue = value; - }, - }; - scope.medium = { - exportSelection: function() { - return {start: 0, end: 0}; - }, - importSelection: function(pos) { /* no-op */ }, - }; - document.body.appendChild(scope.node); - - // eslint-disable-next-line jasmine/no-unsafe-spy - spyOn(scope.model, '$setViewValue').and.callThrough(); - return scope; - } - - it('can spellcheck', inject((editor, spellcheck, $q, $rootScope) => { - spyOn(spellcheck, 'errors').and.returnValue($q.when([{word: 'test', index: 0}])); - spyOn(spellcheck, 'getDictionary').and.returnValue($q.when([{language_id: 'en'}])); - - var scope = createScope('test', $rootScope); - - editor.registerScope(scope); - editor.renderScope(scope); - $rootScope.$digest(); - - expect(scope.node.innerHTML).toBe('test'); - expect(scope.node.parentNode.lastChild.innerHTML) - .toBe('test'); - })); - - it('can replace word in node', inject((editor, $q, $rootScope) => { - var content = 'test foo'; - var scope = createScope(content, $rootScope); - - editor.replaceWord(scope, 5, 3, 'bars'); - expect(scope.node.innerHTML).toBe('test bars'); - })); - - it('can findreplace', inject((editor, spellcheck, $q, $rootScope) => { - spyOn(spellcheck, 'errors').and.returnValue($q.when([{word: 'test', index: 0}])); - spyOn(spellcheck, 'getDictionary').and.returnValue($q.when([{language_id: 'en'}])); - - var scope = createScope('test foo and foo', $rootScope); - - editor.registerScope(scope); - - editor.setSettings({findreplace: {diff: {foo: '', bar: ''}}}); - editor.render(); - $rootScope.$digest(); - editor.selectNext(); - - var foo1 = 'foo'; - var foo1active = 'foo'; - var foo2 = 'foo'; - var foo2active = 'foo'; - - expect(scope.node.innerHTML).toBe('test foo and foo'); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1active + ' and ' + foo2); - - editor.selectNext(); - expect(scope.node.innerHTML).toBe('test foo and foo'); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1 + ' and ' + foo2active); - - editor.selectPrev(); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test ' + foo1active + ' and ' + foo2); - - editor.replace('tic'); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('test tic and foo'); - editor.render(); - $rootScope.$digest(); - editor.selectNext(); - expect(scope.node.parentNode.lastChild.innerHTML).toBe('test tic and ' + foo2active); - - editor.setSettings({findreplace: {diff: {test: ''}}}); - editor.render(); - $rootScope.$digest(); - editor.replaceAll('bars'); - expect(scope.node.innerHTML).toBe('bars tic and foo'); - - editor.setSettings({findreplace: null}); - editor.render(); - $rootScope.$digest(); - expect(scope.node.parentNode.lastChild.innerHTML).toContain('sderror'); - expect(scope.node.parentNode.lastChild.innerHTML).not.toContain('active'); - expect(scope.node.innerHTML).toBe('bars tic and foo'); - })); - - it('can replace abbreviations', inject((editor, spellcheck, $q, $rootScope, $timeout) => { - editor.setSettings({spellcheck: true}); - var abbreviations = { - IMF: 'International Monetory Fund', - WHO: 'World Health Organisation', - UN: 'United Nations', - }; - - spyOn(spellcheck, 'getAbbreviationsDict').and.returnValue($q.when(abbreviations)); - var scope = createScope('test', $rootScope); - - editor.registerScope(scope); - scope.node.parentNode.classList.add('typing'); - - scope.node.innerHTML = 'foo'; - editor.commit(); - expect(scope.model.$setViewValue).not.toHaveBeenCalled(); - $rootScope.$digest(); - expect(scope.model.$setViewValue).toHaveBeenCalledWith('foo'); - expect(scope.node.innerHTML).toBe('foo'); - - scope.node.innerHTML = 'foo IMF*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo ' + abbreviations.IMF); - - scope.node.innerHTML = 'foo IMF IMF* IMF*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo IMF ' + abbreviations.IMF + ' ' + abbreviations.IMF); - - scope.node.innerHTML = 'foo IMF* WHO*'; - editor.commit(); - $rootScope.$digest(); - expect(scope.node.innerHTML).toBe('foo ' + abbreviations.IMF + ' ' + abbreviations.WHO); - })); - - it('can check if keyboard event is important or not', inject((editor) => { - expect(editor.shouldIgnore({keyCode: 16})).toBe(true); - expect(editor.shouldIgnore({shiftKey: true, ctrlKey: true, keyCode: 65})).toBe(true); - expect(editor.shouldIgnore({keyCode: 65})).toBe(false); - })); -}); diff --git a/scripts/core/editor2/editor.ts b/scripts/core/editor2/editor.ts deleted file mode 100644 index 0fed26ca7e..0000000000 --- a/scripts/core/editor2/editor.ts +++ /dev/null @@ -1,1771 +0,0 @@ -/** - * This file is part of Superdesk. - * - * Copyright 2013, 2014 Sourcefabric z.u. and contributors. - * - * For the full copyright and license information, please see the - * AUTHORS and LICENSE files distributed with this source code, or - * at https://www.sourcefabric.org/superdesk/license - */ -import MediumEditor from 'medium-editor'; -import MediumEditorTable from 'medium-editor-tables'; -import _ from 'lodash'; -import {get} from 'lodash'; -import {gettext, escapeRegExp} from 'core/utils'; - -import './customAnchor'; -import {appConfig} from 'appConfig'; - -var TYPING_CLASS = 'typing'; - -/** - * History stack - * - * It supports undo/redo operations - * - * @param {string} initialValue - */ -function HistoryStack(initialValue) { - var stack = []; - var index = -1; - - /** - * Add a new value to stack and remove all furhter redo values - * so after manual change there is no way to redo. - * - * @param {string} value - */ - this.add = function(value) { - index = index + 1; - stack[index] = value; - stack.splice(index + 1, stack.length); - }; - - /** - * Select previous value (undo) - */ - this.selectPrev = function() { - index = Math.max(-1, index - 1); - }; - - /** - * Select next value (redo) - */ - this.selectNext = function() { - index = !_.isNil(stack[index + 1]) ? index + 1 : index; - }; - - /** - * Get current value - */ - this.get = function() { - var state = index > -1 ? stack[index] : initialValue; - - return state; - }; - - /** - * Get current index - * - * @return {Number} - */ - this.getIndex = function() { - return index; - }; -} - -EditorService.$inject = ['spellcheck', '$q', 'renditions', 'editorUtils']; -function EditorService(spellcheck, $q, renditionsService, utils) { - this.settings = {spellcheck: true}; - - this.version = () => '2'; - - this.KEY_CODES = Object.freeze({ - Y: 'Y'.charCodeAt(0), - Z: 'Z'.charCodeAt(0), - UP: 38, - DOWN: 40, - F3: 114, - }); - - this.ARROWS = Object.freeze({ - 33: 1, // page up - 34: 1, // page down - 35: 1, // end - 36: 1, // home - 37: 1, // left - 38: 1, // up - 39: 1, // right - 40: 1, // down - }); - - this.META = Object.freeze({ - 16: 1, // shift - 17: 1, // ctrl - 18: 1, // alt - 20: 1, // caps lock - 91: 1, // left meta in webkit - 93: 1, // right meta in webkit - 224: 1, // meta in firefox - }); - - /** - * Test if given keyboard event should be ignored as it's not changing content. - * - * @param {Event} event - * @return {boolen} - */ - this.shouldIgnore = function(event) { - // ignore arrows - if (self.ARROWS[event.keyCode]) { - return true; - } - - // ignore meta keys (ctrl, shift or meta only) - if (self.META[event.keyCode]) { - return true; - } - - // ignore shift + ctrl/meta + something - if (event.shiftKey && (event.ctrlKey || event.metaKey)) { - return true; - } - - return false; - }; - - var ERROR_CLASS = 'sderror'; - var HILITE_CLASS = 'sdhilite'; - var ACTIVE_CLASS = 'sdactive'; - var FINDREPLACE_CLASS = 'sdfindreplace'; - - var self = this; - var scopes = []; - - /** - * Register given scope - it adds history stack to it and keeps reference - * - * @param {Scope} scope - */ - this.registerScope = function(scope) { - scopes.push(scope); - scope.history = new HistoryStack(scope.model.$viewValue || ''); - scope.$on('$destroy', () => { - var index = scopes.indexOf(scope); - - scopes.splice(index, 1); - }); - }; - - /** - * Render highlights for given scope based on settings - * - * @param {Scope} scope - * @param {Scope} force force rendering manually - eg. via keyboard - */ - this.renderScope = function(scope, force, preventStore) { - if (self.settings.findreplace) { - renderFindreplace(scope.node); - } else if (self.settings.spellcheck || force) { - spellcheck.getDictionary(scope.language).then((dictionaries) => { - if (dictionaries && dictionaries.length) { - renderSpellcheck(scope.node, preventStore); - } - }); - } else { - utils.removeHilites(scope.node); - } - }; - - /** - * Render highlights in all registered scopes - * - * @param {Boolean} force rendering - */ - this.render = function(force) { - scopes.forEach((scope) => { - self.renderScope(scope, force); - }); - }; - - /** - * Highlight find&replace matches in given node - * - * @param {Node} node - */ - function renderFindreplace(node) { - var tokens = utils.getFindReplaceTokens(node, self.settings); - - utils.hilite(node, tokens, FINDREPLACE_CLASS); - } - - /** - * Highlight spellcheck errors in given node - * - * @param {Node} node - */ - function renderSpellcheck(node, preventStore) { - spellcheck.errors(node).then((tokens) => { - utils.hilite(node, tokens, ERROR_CLASS, preventStore); - }); - } - - /** - * Set next highlighted node active. - * - * In case there is no node selected select first one. - */ - this.selectNext = function() { - var nodes = document.body.getElementsByClassName(HILITE_CLASS); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes.item(i); - - if (node.classList.contains(ACTIVE_CLASS)) { - node.classList.remove(ACTIVE_CLASS); - var nextNode = nodes.item((i + 1) % nodes.length); - - nextNode.classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - return node; - } - } - - if (nodes.length) { - nodes.item(0).classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - } - }; - - function scrollHighlightedNodeToTop() { - let containerElem = angular.element('.page-content-container'); - - if (containerElem.offset()) { - // This offset is to make visible what the top section of the document will hide when scrolled - let baseOffset = angular.element('.subnav__button-stack').prop('clientHeight') + - angular.element('.authoring-sticky').prop('clientHeight') + - angular.element('#top-menu').prop('clientHeight'); - - let classList = '.' + FINDREPLACE_CLASS + '.' + ACTIVE_CLASS + '.' + HILITE_CLASS; - - let nodeElem = angular.element(classList); - - if (nodeElem.length > 0) { - // All set, scroll to the highlighted element - containerElem.scrollTop(nodeElem.offset().top - containerElem.offset().top + - containerElem.scrollTop() - baseOffset); - } - } - } - - /** - * Set previous highlighted node active. - */ - this.selectPrev = function() { - var nodes = document.body.getElementsByClassName(HILITE_CLASS); - - for (var i = 0; i < nodes.length; i++) { - var node = nodes.item(i); - - if (node.classList.contains(ACTIVE_CLASS)) { - node.classList.remove(ACTIVE_CLASS); - nodes.item(i === 0 ? nodes.length - 1 : i - 1).classList.add(ACTIVE_CLASS); - scrollHighlightedNodeToTop(); - return; - } - } - }; - - function replaceText(scope, text, className = ACTIVE_CLASS) { - var nodes = scope.node.parentNode.getElementsByClassName(className); - var nodesLength = nodes.length; - var replacementOffset = self.replaceNodes(nodes, text, scope); - - if (replacementOffset && className === ACTIVE_CLASS) { - updateIndexOnReplace(scope.node, replacementOffset); - } - return nodesLength; - } - - // updates the data-index of remaining find-replace candidates subsequent to just replaced active node - function updateIndexOnReplace(node, replacementOffset) { - var nodes = node.parentNode.getElementsByClassName(HILITE_CLASS); - var nextElem, newIndex, activeIndex; - - for (var i = 0; i < nodes.length; i++) { - var currentNode = nodes.item(i); - - if (currentNode.classList.contains(ACTIVE_CLASS)) { - currentNode.classList.remove(FINDREPLACE_CLASS); - activeIndex = i; - } - } - - if (!_.isNil(activeIndex)) { - for (var j = activeIndex + 1; j < nodes.length; j++) { - nextElem = nodes.item(j); - newIndex = parseInt(nextElem.getAttribute('data-index'), 10) + replacementOffset; - nextElem.setAttribute('data-index', newIndex); - } - } - } - - /** - * Replace active node with given text. - * - * @param {string} text - */ - this.replace = function(text) { - scopes.forEach((scope) => { - if (replaceText(scope, text)) { - this.commitScope(scope); - } - }); - }; - - /** - * Replace all highlighted nodes with given text. - * - * @param {string} text - */ - this.replaceAll = function(text) { - scopes.forEach((scope) => { - var nodes = scope.node.parentNode.getElementsByClassName(HILITE_CLASS); - - this.replaceNodes(nodes, text, scope); - this.commitScope(scope); - }); - }; - - /** - * Replace text at given index with word - * - * @param {Object} scope - * @param {Number} index - * @param {Number} length - * @param {String} word - */ - this.replaceWord = function(scope, index, length, word) { - var node = scope.node; - var start = utils.findWordNode(node, index, length); - var characters = start.node.textContent.split(''); - - characters.splice(start.offset, length, word); - start.node.textContent = characters.join(''); - }; - - /** - * Replace all nodes with text - * - * @param {HTMLCollection} nodes - * @param {string} text - */ - this.replaceNodes = function(nodes, text, scope) { - var index, replacementOffset = 0; - - for (var i = 0, l = nodes.length; i < l; i++) { - var node = nodes.item(i); - var word = node.dataset.word; - - index = parseInt(node.dataset.index, 10) + replacementOffset; - this.replaceWord(scope, index, word.length, text); - replacementOffset += text.length - word.length; - } - return replacementOffset; - }; - - /** - * Update settings - * - * @param {Object} settings - */ - this.setSettings = function(settings) { - self.settings = angular.extend({}, self.settings, settings); - }; - - /** - * Test if given elem is a spellcheck error node - * - * @param {Node} elem - * @return {boolean} - */ - this.isErrorNode = function(elem) { - return elem.classList.contains(ERROR_CLASS); - }; - - /** - * Commit changes in all scopes - */ - this.commit = function() { - scopes.forEach(self.commitScope); - }; - - /** - * Replace abbreviations. - * @param {Scope} scope - */ - function replaceAbbreviations(scope) { - if (!scope.node.parentNode.classList.contains(TYPING_CLASS)) { - return $q.when({}); - } - - if (scope.node.innerText !== '') { - return spellcheck.getAbbreviationsDict().then((abbreviations) => { - if (_.keys(abbreviations).length) { - var pattern = '\\b(' - + _.map(_.keys(abbreviations), (item) => escapeRegExp(item)).join('|') + ')(\\*)'; - var found = scope.node.innerText.match(new RegExp(pattern, 'g')); - - if (found) { - // store old settings - var oldSettings = angular.extend({}, self.settings); - var caretPosition = scope.medium.exportSelection(); - - _.forEach(_.uniq(found), (val: string) => { - var replacementValue = abbreviations[val.replace('*', '')]; - - if (replacementValue) { - var diff = {}; - - diff[val] = replacementValue; - self.setSettings({findreplace: {diff: diff, caseSensitive: true}}); - renderFindreplace(scope.node); - var nodesLength = replaceText(scope, replacementValue, FINDREPLACE_CLASS); - - if (nodesLength > 0) { - var incrementCaretPosition = (replacementValue.length - val.length) * nodesLength; - - caretPosition.start += incrementCaretPosition; - caretPosition.end += incrementCaretPosition; - } - } - }); - - scope.medium.importSelection(caretPosition); - // apply old settings - self.setSettings({findreplace: oldSettings.findreplace ? oldSettings.findreplace : null}); - } - } - }); - } - - return $q.when({}); - } - - /** - * Commit changes in given scope to its model - * - * @param {Scope} scope - */ - this.commitScope = function(scope) { - replaceAbbreviations(scope).then(() => { - var nodeValue = scope.node.innerHTML; - - if (nodeValue !== scope.model.$viewValue) { - scope.model.$setViewValue(nodeValue); - scope.history.add(scope.model.$viewValue); - } - }); - }; - - /** - * Returns the cleaned node text - * - * @return {string} - */ - this.getNodeText = function(scope) { - return scope.node.innerHTML; - }; - - /** - * Get active node text - * - * @return {string} - */ - this.getActiveText = function() { - var active; - - scopes.forEach((scope) => { - var nodes = scope.node.parentNode.getElementsByClassName(ACTIVE_CLASS); - - active = nodes.length ? nodes.item(0) : active; - }); - - return active ? active.textContent : null; - }; - - /** - * Return html code to represent an embedded link - * - * @param {string} url - * @param {string} titleg - * @param {string} description - * @param {string} illustration - * @return {string} html - */ - this.generateLinkTag = ({url, title, description, illustration}) => [ - '

', - angular.isDefined(illustration) ? - ' ' : '', - '
', - ' ' + title + '', - '
', - angular.isDefined(description) ? - '
' + description + '
' : '', - '
', - ].join('\n'); - - this.generateMediaTag = function(data) { - var mediaTypes: any = { - video: function() { - var videoTag = [''); - return videoTag.join(''); - }, - picture: function() { - var url = data.url, altText = data.altText; - var promiseFinished; - // if this is a SD archive, we use its properties - - if (data._type === 'archive' || data.type === 'picture' || data.type === 'graphic') { - // get expected renditions list - promiseFinished = renditionsService.get().then((renditionsList) => { - // ]use the first rendtion as default - var firstRendition = data.renditions[renditionsList[0].name]; - - if (angular.isDefined(firstRendition)) { - url = firstRendition.href; - } else { - // use "viewImage" rendition as fallback - url = data.renditions.viewImage.href; - } - // if a `alt_text` exists, otherwise we fill w/ `description_text` - altText = data.alt_text || data.description_text; - return renditionsList; - }); - } - // when previous promise is finished, compose the html - return $q.when(promiseFinished, (renditionsList) => { - var html = [' { - if (r.width) { - var rendition = data.renditions[r.name]; - - if (angular.isDefined(rendition)) { - renditionsHtml.push(rendition.href.replace('http://', '//') - + ' ' + rendition.width + 'w'); - } - } - }); - if (renditionsHtml.length > 0) { - html.push('srcset="' + renditionsHtml.join(', ') + '"'); - } - } - html.push('/>'); - return html.join(' '); - }); - }, - }; - - mediaTypes.graphic = mediaTypes.picture; - return $q.when(mediaTypes[data.type]()); - }; - - this.getSelectedText = function() { - var text = ''; - - if (window.getSelection) { - text = window.getSelection().toString(); - } else if (document['selection'] && document['selection'].type !== 'Control') { - text = document['selection'].createRange().text; - } - return text; - }; -} - -SdTextEditorBlockEmbedController.$inject = ['$timeout', 'editor', 'renditions']; -function SdTextEditorBlockEmbedController($timeout, editor, renditions) { - var self = this; - - angular.extend(self, { - embedCode: undefined, // defined below - caption: undefined, // defined below - title: undefined, // defined below - editable: false, - toggleEdition: function() { - self.editable = !self.editable; - }, - saveEmbedCode: function() { - // update the block's model - angular.extend(self.model, { - body: self.embedCode, - }); - // on change callback - self.onBlockChange(); - }, - cancel: function() { - self.embedCode = self.model.body; - }, - saveCaption: function(caption, title) { - // if block is a superdesk image (with association), we update the description_text and headline - if (self.model.association) { - self.model.association.description_text = caption; - self.model.association.headline = title; - } - // update the caption in the model - self.model.caption = caption; - self.model.title = title; - - // update the caption in the view - self.caption = caption; - self.title = title; - - // on change callback - $timeout(() => { - self.onBlockChange(); - }); - }, - handlePaste: function(e) { - e.preventDefault(); - e.stopPropagation(); - - var clipboardData = e.originalEvent.clipboardData || window.clipboardData; - var pastedData = clipboardData.getData('Text'); - - $timeout(() => { - document.execCommand('insertHTML', false, pastedData); - }); - }, - isEditable: function(picture) { - return picture._type !== 'externalsource'; - }, - editPicture: function(picture) { - // only for SD images (with association) - if (!self.model.association) { - return false; - } - self.model.loading = true; - renditions.crop(picture).then((croppedPicture) => { - // update block - self.model.association = croppedPicture; - editor.generateMediaTag(croppedPicture).then((img) => { - self.model.body = img; - }); - // update caption - self.saveCaption(self.model.association.description_text, self.model.association.headline); - }) - .finally(() => { - self.model.loading = false; - }); - }, - }); - $timeout(() => { - angular.extend(self, { - embedCode: self.model.body, - caption: self.model.caption, - - // model.association has no value when embed source is not superdesk - title: get(self, 'model.association.headline', ''), - }); - }); -} - -angular.module('superdesk.apps.editor2', [ - 'superdesk.apps.editor2.ctrl', - 'superdesk.apps.editor2.embed', - 'superdesk.apps.editor2.content', - 'superdesk.apps.editor2.utils', - 'superdesk.apps.spellcheck', - 'superdesk.apps.authoring', - 'angular-embed', -]) - .service('editor', EditorService) - .constant('EMBED_PROVIDERS', { // see http://noembed.com/#supported-sites - custom: 'Custom', - twitter: 'Twitter', - youtube: 'YouTube', - vidible: 'Vidible', - }) - .directive('sdAddEmbed', ['$timeout', function($timeout) { - return { - scope: {addToPosition: '=', extended: '=', onClose: '&'}, - require: ['sdAddEmbed', '^sdTextEditor'], - templateUrl: 'scripts/core/editor2/views/add-embed.html', - controllerAs: 'vm', - controller: 'SdAddEmbedController', - bindToController: true, - link: function(scope, element, attrs, controllers) { - var vm = controllers[0]; - - angular.extend(vm, { - editorCtrl: controllers[1], - }); - // listen to the escape touch to close the field when pressed - element.bind('keyup', (e) => { - if (e.keyCode === 27) { // escape - $timeout(() => { - vm.extended = false; - }); - } - }); - }, - }; - }]) - .directive('sdTextEditorDropZone', ['embedService', 'EMBED_PROVIDERS', 'editor', '$timeout', '$q', - (embedService, EMBED_PROVIDERS, editor, $timeout, $q) => { - var dragOverClass = 'medium-editor-dragover'; - - return { - require: '^sdTextEditorBlockText', - scope: {sdTextEditorDropZone: '@'}, - link: function(scope, element, attrs, ctrl) { - if (scope.sdTextEditorDropZone === 'false') { - return; - } - - var MEDIA_TYPES = [ - 'application/superdesk.item.picture', - 'application/superdesk.item.graphic', - 'application/superdesk.item.video', - 'application/superdesk.item.audio', - 'text/html', - ]; - - let getType = (event) => MEDIA_TYPES.find( - (_type) => event.originalEvent.dataTransfer.types.indexOf(_type) >= 0, - ); - - element.on('drop dragdrop', (event) => { - event.preventDefault(); - event.stopPropagation(); - const mediaType = getType(event); - const paragraph = angular.element(event.target); - - let item = event.originalEvent.dataTransfer.getData(mediaType); - - // we want to ensure that the field is empty before inserting something - if (paragraph.text() !== '') { - return false; - } - // remove the UI state - paragraph.removeClass(dragOverClass); - // select paragraph element in order to register position - ctrl.selectElement(paragraph.get(0)); - // assume this is an item in json format when it comes from superdesk - if (mediaType.indexOf('application/superdesk') === 0) { - item = angular.fromJson(item); - // insert the item - ctrl.insertMedia(item); - } else if (mediaType === 'text/html' && typeof item === 'string') { - $q.when((() => { - // if it's a link (...), create an embed by using iframely - // if not, create an embed based on the item content - const urlMatch = //.exec(item); - - if (urlMatch) { - return embedService.get(urlMatch[1]).then((data) => ({ - blockType: 'embed', - embedType: data.provider_name || EMBED_PROVIDERS.custom, - body: data.html || editor.generateLinkTag({ - url: data.url, - title: data.meta.title, - description: data.meta.description, - illustration: data.thumbnail_url, - }), - })); - } - return { - blockType: 'embed', - embedType: EMBED_PROVIDERS.custom, - body: item, - }; - })()) - // split the current block and insert the new block, then commit changes - .then((block) => { - ctrl.sdEditorCtrl.splitAndInsert(ctrl, block) - .then(() => $timeout(ctrl.sdEditorCtrl.commitChanges)); - }); - } - }) - .on('dragover', (event) => { - const paragraph = angular.element(event.target); - - let matching = getType(event); - - if (matching) { - // allow to overwite the drop binder (see above) - event.preventDefault(); - event.stopPropagation(); - // if dragged element is a picture and if the paragraph is empty, - // highlight the paragraph - if (paragraph.text() === '') { - return paragraph.addClass(dragOverClass); - } - } - // otherwise, remove the style - paragraph.removeClass(dragOverClass); - }) - .on('dragleave', (event) => { - const paragraph = angular.element(event.target); - - paragraph.removeClass(dragOverClass); - }); - }, - }; - }]) - .directive('sdTextEditor', ['$timeout', function($timeout) { - return { - scope: {type: '=', config: '=', editorformat: '=', language: '=', associations: '=?', readOnly: '=?'}, - require: ['sdTextEditor', 'ngModel'], - templateUrl: 'scripts/core/editor2/views/editor.html', - controllerAs: 'vm', - controller: 'SdTextEditorController', - bindToController: true, - link: function(scope, element, attr, controllers) { - var controller = controllers[0]; - var ngModel = controllers[1]; - - window.dispatchEvent(new CustomEvent('editorInitialized')); - - function init() { - scope.$applyAsync(() => { - if (controller.config.multiBlockEdition) { - controller.initEditorWithMultipleBlock(ngModel); - } else { - controller.initEditorWithOneBlock(ngModel); - } - }); - } - // init editor based on model - init(); - // when the model changes from outside, updates the editor - scope.$watch(function outsideModelChange() { - return ngModel.$viewValue; - }, () => { - $timeout(() => { - // if controller is ready and the value has changed - if (controller.blocks.length > 0 && ngModel.$viewValue !== controller.serializeBlock()) { - // if blocks are not loading - if (!_.some(controller.blocks, (block) => block.loading)) { - init(); - } - } - }, 250, false); - }); - }, - }; - }]) - .directive('sdTextEditorBlockEmbed', () => - ({ - scope: {type: '=', config: '=', language: '=', model: '=sdTextEditorBlockEmbed', onBlockChange: '&'}, - templateUrl: 'scripts/core/editor2/views/block-embed.html', - controllerAs: 'vm', - bindToController: true, - controller: SdTextEditorBlockEmbedController, - }), - ) - .directive('sdTextEditorBlockText', ['editor', 'spellcheck', '$timeout', - '$q', '$rootScope', - function(editor, spellcheck, $timeout, $q, $rootScope) { - var TOP_OFFSET = 134; // header height - - var EDITOR_CONFIG = { - toolbar: { - static: true, - align: 'left', - sticky: true, - stickyTopOffset: TOP_OFFSET, - updateOnEmptySelection: true, - }, - paste: { - // Both are disabled because it overwrites the `ctrl`+`v` binding - // and we need it for the block paste feature - forcePlainText: false, - cleanPastedHTML: false, - // SDESK-714 chrome will replace

by

. This line reverts it (SDESK-714) - cleanReplacements: [[new RegExp(//gi), '

'], [new RegExp(/<\/div>/gi), '

']], - }, - anchor: { - placeholderText: gettext('Paste or type a full link'), - linkValidation: true, - }, - anchorPreview: { - showWhenToolbarIsVisible: true, - }, - placeholder: false, - disableReturn: false, - spellcheck: false, - targetBlank: true, - }; - - if (appConfig.editor) { - angular.extend(EDITOR_CONFIG, appConfig.editor); - } - - /** - * Get number of lines for all p nodes before given node withing same parent. - */ - function getLinesBeforeNode(p) { - function getLineCount(text) { - return text.split('\n').length; - } - - var lines = 0; - var pos = p; - - while (pos) { - if (pos.childNodes.length && pos.childNodes[0].nodeType === Node.TEXT_NODE) { - lines += getLineCount(pos.childNodes[0].wholeText); - } else if (pos.childNodes.length) { - lines += 1; // empty paragraph - } - pos = pos.previousSibling; - } - - return lines; - } - - /** - * Get line/column coordinates for given cursor position. - */ - function getLineColumn() { - var column, lines, - selection = window.getSelection(); - - if (selection.anchorNode.nodeType === Node.TEXT_NODE) { - var text = selection.anchorNode['wholeText'].substring(0, selection.anchorOffset); - var node = selection.anchorNode; - - column = text.length + 1; - while (node.nodeName !== 'P') { - if (node.previousSibling) { - column += node.previousSibling['wholeText'] ? - node.previousSibling['wholeText'].length : - node.previousSibling.textContent.length; - node = node.previousSibling; - } else { - node = node.parentNode; - } - } - - lines = 0 + getLinesBeforeNode(node); - } else { - lines = 0 + getLinesBeforeNode(selection.anchorNode); - column = 1; - } - - return { - line: lines, - column: column, - }; - } - - function extractBlockContentsFromCaret() { - function getBlockContainer(node) { - var pos = node; - - while (pos) { - if (pos.nodeType === 1 && /^(DIV)$/i.test(pos.nodeName)) { - return pos; - } - pos = pos.parentNode; - } - } - var sel = window.getSelection(); - - if (sel.rangeCount) { - var selRange = sel.getRangeAt(0); - var blockEl = getBlockContainer(selRange.endContainer); - - if (blockEl) { - var range = selRange.cloneRange(); - - range.selectNodeContents(blockEl); - range.setStart(selRange.endContainer, selRange.endOffset); - var remaining = range.extractContents(); - var $blockEl = $(blockEl); - // clear if empty of text - - if ($blockEl.text() === '') { - $blockEl.html(''); - } - // remove empty last line - $blockEl.find('p:last').each(function() { - if ($(this).text() === '') { - this.remove(); - } - }); - return remaining; - } - } - } - - function setEditorFormatOptions(editorConfig, editorFormat, scope) { - function addButton(format) { - editorConfig.toolbar.buttons.push({ - h1: { - name: 'h1', - action: 'append-h2', - aria: gettext('header type 1'), - tagNames: ['h2'], - contentDefault: '' + gettext('H1') + '', - classList: ['custom-class-h1'], - attrs: { - 'data-custom-attr': 'attr-value-h1', - }, - }, - - h2: { - name: 'h2', - action: 'append-h3', - aria: gettext('header type 2'), - tagNames: ['h3'], - contentDefault: '' + gettext('H2') + '', - classList: ['custom-class-h2'], - attrs: { - 'data-custom-attr': 'attr-value-h2', - }, - }, - - bold: { - name: 'bold', - action: 'bold', - aria: gettext('bold'), - tagNames: ['b'], - contentDefault: '' + gettext('B') + '', - }, - - underline: { - name: 'underline', - action: 'underline', - aria: gettext('underline'), - tagNames: ['u'], - }, - - italic: { - name: 'italic', - action: 'italic', - aria: gettext('italic'), - tagNames: ['i'], - contentDefault: '' + gettext('I') + '', - }, - - quote: { - name: 'quote', - action: 'append-blockquote', - aria: gettext('quote'), - }, - - removeFormat: { - name: 'removeFormat', - action: 'removeFormat', - aria: gettext('remove formatting'), - }, - - link: { - name: 'anchor', - action: 'createLink', - aria: gettext('link'), - }, - }[format] || format); - } - - _.each(editorFormat, addButton); - } - - return { - scope: {type: '=', config: '=', language: '=', sdTextEditorBlockText: '=', readOnly: '=?'}, - require: ['ngModel', '^sdTextEditor', 'sdTextEditorBlockText'], - templateUrl: 'scripts/core/editor2/views/block-text.html', - link: function(scope, elem, attrs, controllers) { - var ngModel = controllers[0]; - var sdTextEditor = controllers[1]; - - scope.model = ngModel; - // give the block model and the editor controller to the text block controller - var vm = controllers[2]; - - angular.extend(vm, { - block: scope.sdTextEditorBlockText, - sdEditorCtrl: sdTextEditor, - }); - vm.block = scope.sdTextEditorBlockText; - var editorElem; - var updateTimeout; - var renderTimeout; - - ngModel.$viewChangeListeners.push(changeListener); - ngModel.$render = function() { - editor.registerScope(scope); - var editorConfig = angular.merge( - {}, - EDITOR_CONFIG, scope.config || {}, - {disableEditing: scope.readOnly}, - ); - - if (editorConfig.toolbar) { - editorConfig.toolbar.buttons = []; - setEditorFormatOptions(editorConfig, sdTextEditor.editorformat, scope); - // if config.multiBlockEdition is true, add Embed and Image button to the toolbar - if (scope.config.multiBlockEdition) { - // this dummy imageDragging stop preventing drag & drop events - editorConfig.extensions = {imageDragging: {}}; - if (editorConfig.toolbar.buttons.indexOf('table') !== -1 - && angular.isDefined(MediumEditorTable)) { - editorConfig.extensions.table = new MediumEditorTable({ - aria: gettext('insert table'), - }); - } - } - } - - spellcheck.setLanguage(scope.language); - editorElem = elem.find(scope.type === 'preformatted' ? '.editor-type-text' - : '.editor-type-html'); - // events could be attached already, so remove these - editorElem.off('mouseup keydown keyup click contextmenu'); - editorElem.empty(); - editorElem.html(ngModel.$viewValue || ''); - scope.node = editorElem[0]; - scope.model = ngModel; - // destroy exiting instance - if (scope.medium) { - scope.medium.destroy(); - } - - // create a new instance of the medium editor binded to this node - scope.medium = new MediumEditor(scope.node, editorConfig); - // restore the selection if exist - if (scope.sdTextEditorBlockText.caretPosition) { - scope.node.focus(); - vm.restoreSelection(); - // clear the saved position - scope.sdTextEditorBlockText.caretPosition = undefined; - } - // listen for paste event and insert a block if exists in clipboard - scope.medium.subscribe('editablePaste', (e) => { - var clipboard = vm.sdEditorCtrl.getCutBlock(true); - - if (clipboard) { - e.preventDefault(); - vm.sdEditorCtrl.splitAndInsert(vm, clipboard); - } - }); - // listen caret moves in order to show or hide the (+) button beside the caret - function updateAddContentButton(e) { - scope.$emit('sdAddContent::updateState', e, editorElem); - } - editorElem.on('mouseup', updateAddContentButton); - ['editableInput', 'focus', 'blur', 'editableClick', 'editableKeyup'] - .forEach((eventName) => { - scope.medium.subscribe(eventName, updateAddContentButton); - }); - // listen updates by medium editor to update the model - scope.medium.subscribe('editableInput', (e, element) => { - element.querySelectorAll('span[style]').forEach((span) => { - span.before(span.firstChild); - span.remove(); - }); - - cancelTimeout(); - updateTimeout = $timeout(vm.updateModel, 200, false); - }); - scope.medium.subscribe('blur', () => { - // save latest know caret position - vm.savePosition(); - - vm.updateModel(); - }); - // update the toolbar, bc it can be displayed at the - // wrong place if offset of block has changed - scope.medium.subscribe('focus', () => { - var toolbar = scope.medium.getExtensionByName('toolbar'); - - if (toolbar) { - toolbar.positionStaticToolbar(scope.medium.getFocusedElement()); - } - }); - - // hide toolbar if element is under header - scope.medium.subscribe('positionedToolbar', (e, element) => { - var toolbar = scope.medium.getExtensionByName('toolbar'), - elemPosition = element.getBoundingClientRect(); - - if (toolbar) { - toolbar.toolbar.hidden = elemPosition.top + elemPosition.height < TOP_OFFSET; - } - }); - - function cancelTimeout(event?) { - $timeout.cancel(updateTimeout); - startTyping(); - } - - function changeSelectedParagraph(direction) { - var selectedParagraph = angular.element(scope.medium.getSelectedParentElement()); - var paragraphToBeSelected = selectedParagraph[direction > 0 ? 'next' : 'prev']('p'); - - if (paragraphToBeSelected.length > 0) { - // select the paragraph - scope.medium.selectElement(paragraphToBeSelected.get(0)); - // scroll to the paragraph - var $scrollableParent = $('.page-content-container'); - var offset = $scrollableParent.scrollTop(); - - offset += paragraphToBeSelected.position().top; - offset += paragraphToBeSelected.closest('.block__container').offset().top; - offset -= 100; // margin to prevent the top bar to hide the selected paragraph - $scrollableParent.scrollTop(offset); - } - } - - function toggleCase() { - var selectedText = editor.getSelectedText(); - - if (selectedText.length > 0) { - // looks the first character, and inverse the case of the all selection - if (selectedText[0].toUpperCase() === selectedText[0]) { - selectedText = selectedText.toLowerCase(); - } else { - selectedText = selectedText.toUpperCase(); - } - scope.medium.saveSelection(); - // replace the selected text - scope.medium.cleanPaste(selectedText); - scope.medium.restoreSelection(); - } - } - - var ctrlOperations = {}, shiftOperations = {}; - - ctrlOperations[editor.KEY_CODES.UP] = changeSelectedParagraph.bind(null, -1); - ctrlOperations[editor.KEY_CODES.DOWN] = changeSelectedParagraph.bind(null, 1); - shiftOperations[editor.KEY_CODES.F3] = toggleCase; - editorElem.on('keydown', (event) => { - if (editor.shouldIgnore(event)) { - return; - } - // prevent default behaviour for ctrl or shift operations - if (event.ctrlKey && ctrlOperations[event.keyCode] || - event.shiftKey && shiftOperations[event.keyCode]) { - event.preventDefault(); - } - cancelTimeout(event); - }); - editorElem.on('keyup', (event) => { - if (editor.shouldIgnore(event)) { - return; - } - if (event.ctrlKey && ctrlOperations[event.keyCode]) { - ctrlOperations[event.keyCode](); - return; - } - if (event.shiftKey && shiftOperations[event.keyCode]) { - shiftOperations[event.keyCode](); - return; - } - cancelTimeout(event); - updateTimeout = $timeout(vm.updateModel, 200, false); - }); - - /** - * Test if given point {x, y} is in given bouding rectangle. - */ - function isPointInRect(point, rect) { - return rect.left < point.x && rect.right > point.x && rect.top < point.y - && rect.bottom > point.y; - } - - editorElem.on('contextmenu', (event) => { - var err, pos; - var point = {x: event.clientX, y: event.clientY}; - var errors = elem[0].parentNode.getElementsByClassName('sderror'); - - for (var i = 0, l = errors.length; i < l; i++) { - err = errors.item(i); - pos = err.getBoundingClientRect(); - if (isPointInRect(point, pos)) { - event.preventDefault(); - event.stopPropagation(); - renderContextMenu(err); - return false; - } - } - }); - - function renderContextMenu(node) { - // close previous menu (if any) - scope.$apply(() => { - scope.suggestions = null; - scope.openDropdown = false; - }); - - // set data needed for replacing - scope.replaceWord = node.dataset.word; - scope.replaceIndex = parseInt(node.dataset.index, 10); - scope.sentenceWord = node.dataset.sentenceWord === 'true'; - - spellcheck.suggest(node.textContent).then((suggestions) => { - if (scope.sentenceWord) { - suggestions.push({ - key: scope.replaceWord[0].toUpperCase() + scope.replaceWord.slice(1), - value: scope.replaceWord[0].toUpperCase() + scope.replaceWord.slice(1), - }); - - scope.suggestions = suggestions.filter((suggestion) => - suggestion.key !== scope.replaceWord, - ); - } else { - scope.suggestions = suggestions; - } - scope.replaceTarget = node; - scope.$applyAsync(() => { - var menu = elem[0].getElementsByClassName('dropdown__menu')[0]; - - menu.style.left = node.offsetLeft + 'px'; - menu.style.top = node.offsetTop + node.offsetHeight + 'px'; - menu.style.position = 'absolute'; - scope.openDropdown = true; - }); - }); - return false; - } - - if (scope.type === 'preformatted') { - editorElem.on('keydown keyup click', () => { - scope.$apply(() => { - angular.extend(scope.cursor, getLineColumn()); - }); - }); - } - - scope.$on('$destroy', () => { - scope.medium.destroy(); - editorElem.off(); - }); - scope.cursor = {}; - render(null, null, true); - }; - - scope.removeBlock = function() { - sdTextEditor.removeBlock(scope.sdTextEditorBlockText); - }; - - scope.$on('spellcheck:run', render); - scope.$on('key:ctrl:shift:s', render); - - function render($event, event, preventStore) { - if (!$rootScope.config.features || !$rootScope.config.features.useTansaProofing) { - stopTyping(); - editor.renderScope(scope, $event, preventStore); - if (event) { - event.preventDefault(); - } - } - } - - scope.replace = function(text) { - editor.replaceWord(scope, scope.replaceIndex, scope.replaceWord.length, text); - editor.commitScope(scope); - }; - - scope.addWordToDictionary = function() { - var word = scope.replaceTarget.textContent; - - spellcheck.addWordToUserDictionary(word); - editor.render(); - }; - - scope.ignoreWord = function() { - var word = scope.replaceTarget.textContent; - - spellcheck.ignoreWord(word); - editor.render(); - }; - - function changeListener() { - $timeout.cancel(renderTimeout); - renderTimeout = $timeout(render, 0, false); - } - - function startTyping() { - scope.node.parentNode.classList.add(TYPING_CLASS); - } - - function stopTyping() { - scope.node.parentNode.classList.remove(TYPING_CLASS); - } - }, - controller: ['$scope', 'api', 'superdesk', 'renditions', 'send', - function(scope, api, superdesk, renditions, send) { - var self = this; - - angular.extend(self, { - block: undefined, // provided in link method - sdEditorCtrl: undefined, // provided in link method - selectElement: function(element) { - scope.medium.selectElement(element); - // save position - self.savePosition(); - }, - restoreSelection: function() { - scope.medium.importSelection(self.block.caretPosition); - // put the caret at end of the selection - scope.medium.options.ownerDocument.getSelection().collapseToEnd(); - }, - savePosition: function() { - self.block.caretPosition = scope.medium.exportSelection(); - }, - extractEndOfBlock: function() { - // it can happen that user lost the focus on the block when this fct in called - // so we restore the latest known position - self.restoreSelection(); - // extract the text after the cursor - var remainingElementsContainer = document.createElement('div'); - - remainingElementsContainer.appendChild(extractBlockContentsFromCaret().cloneNode(true)); - // remove the first line if empty - $(remainingElementsContainer).find('p:first') - .each(function() { - if ($(this).text() === '') { - this.remove(); - } - }); - return remainingElementsContainer; - }, - updateModel: function() { - editor.commitScope(scope); - }, - insertMedia: function(media) { - const validItems = send.getValidItems([media]); - - if (validItems.length > 0) { - var mediaType = { - picture: 'Image', - graphic: 'Image', - video: 'Video', - }; - var imageBlock = { - blockType: 'embed', - embedType: mediaType[media.type], - caption: media.description_text, - loading: true, - association: media, - }; - - self.sdEditorCtrl.splitAndInsert(self, imageBlock).then((block) => { - // load the media and update the block - $q.when((function() { - if ( - appConfig.features != null - && appConfig.features.editFeaturedImage != null - && !appConfig.features.editFeaturedImage - && media._type === 'externalsource' - ) { - return media; - } - return renditions.ingest(media); - })()).then((mediaObject) => { - editor.generateMediaTag(mediaObject).then((imgTag) => { - angular.extend(block, { - body: imgTag, - association: mediaObject, - loading: false, - }); - $timeout(self.sdEditorCtrl.commitChanges); - }); - }); - }); - } - }, - }); - }], - }; - }]) - .run(['embedService', 'iframelyService', function(embedService, iframelyService) { - // eslint-disable-next-line no-useless-escape - var playBuzzPattern = 'https?:\/\/(?:www)\.playbuzz\.com(.*)$'; - var playBuzzlLoader = '//snappa.embed.pressassociation.io/playbuzz.js'; - var playBuzzEmbed = [ - '', - '
', - ].join(''); - - embedService.registerHandler({ - name: 'PlayBuzz', - patterns: [playBuzzPattern], - embed: function(url) { - return iframelyService.embed(url) - .then((result) => { - result.html = playBuzzEmbed - .replace('$_LOADER', playBuzzlLoader) - .replace('$_URL', url.match(playBuzzPattern)[1]); - return result; - }); - }, - }); - var samdeskEmbed = [ - '', - '
', - ].join(''); - var samDeskPattern = 'https?://embed.samdesk.io/(?:embed|preview)/(.+)'; - - embedService.registerHandler({ - name: 'SAMDesk', - patterns: [samDeskPattern], - embed: function(url) { - var embed = samdeskEmbed.replace('$_ID', url.match(samDeskPattern)[1]); - - return { - provider_name: 'SAMDesk', - html: embed, - url: url, - type: 'rich', - }; - }, - }); - }]) - .config(['embedServiceProvider', 'iframelyServiceProvider', - function(embedServiceProvider, iframelyServiceProvider) { - iframelyServiceProvider.setKey(appConfig.iframely.key); - // don't use noembed as first choice - embedServiceProvider.setConfig('useOnlyFallback', true); - // iframely respect the original embed for more services than 'embedly' - embedServiceProvider.setConfig('fallbackService', 'iframely'); - }]); - -function EditorUtilsFactory() { - var CLONE_CLASS = 'clone'; - var HILITE_CLASS = 'sdhilite'; - var ACTIVE_CLASS = 'sdactive'; - var FINDREPLACE_CLASS = 'sdfindreplace'; - - /** - * Function for sorting array of strings from longest to shortest - * - * @param {string} a - * @param {string} b - * @return {number} - */ - function reverseLengthSort(a, b) { - return b.length - a.length; - } - - /** - * Find text node within given node for given character offset - * - * This will find text node within given node that contains character on given offset - * - * @param {Node} node - * @param {numeric} offset - * @return {Object} {node: {Node}, offset: {numeric}} - */ - function findOffsetNode(node, offset) { - var tree = document.createTreeWalker(node, NodeFilter.SHOW_TEXT); - var currentLength; - var currentOffset = 0; - var ZERO_WIDTH_SPACE = String.fromCharCode(65279); - - while (tree.nextNode()) { - tree.currentNode.textContent = tree.currentNode.textContent.replace(ZERO_WIDTH_SPACE, ''); - currentLength = tree.currentNode.textContent.length; - if (currentOffset + currentLength >= offset) { - return {node: tree.currentNode, offset: offset - currentOffset}; - } - - currentOffset += currentLength; - } - } - - return { - - /** - * Find all matches for current find&replace needle in given node - * - * Each match is {word: {string}, offset: {number}} in given node, - * we can't return nodes here because those will change when we start - * highlighting and offsets wouldn't match - * - * @param {Node} node - * @param {Object} settings - * @return {Array} list of matches - */ - getFindReplaceTokens: function(node, settings) { - var tokens = []; - var diff = settings.findreplace.diff || {}; - var pattern = Object.keys(diff) - .sort(reverseLengthSort) - .map(escapeRegExp) - .join('|'); - - if (!pattern) { - return tokens; - } - - var flags = settings.findreplace.caseSensitive ? 'm' : 'im'; - var re = new RegExp(pattern, flags); - var nodeOffset = 0; - var text, match, offset; - var isActive, elementClone, elementFindReplace; - - elementClone = node.parentNode.getElementsByClassName(CLONE_CLASS); - - if (elementClone && elementClone.length) { - elementFindReplace = elementClone.item(0).getElementsByClassName(FINDREPLACE_CLASS); - } - - function isTokenActive(index) { - var active, matched; - - if (elementFindReplace && elementFindReplace.length) { - matched = _.filter(elementFindReplace, - (elem) => parseInt(elem.getAttribute('data-index'), 10) === index); - - active = matched && matched.length ? matched[0].classList.contains(ACTIVE_CLASS) : false; - } - return active; - } - - var tree = document.createTreeWalker(node, NodeFilter.SHOW_TEXT); - - while (tree.nextNode()) { - text = tree.currentNode.textContent; - - while (!_.isNil(match = text.match(re))) { - isActive = isTokenActive(nodeOffset + match.index); - - tokens.push({ - word: match[0], - index: nodeOffset + match.index, - title: diff[match[0]] || '', - active: isActive, - }); - - offset = match.index + match[0].length; - text = text.substr(offset); - nodeOffset += offset; - } - nodeOffset += text.length; - } - - return tokens; - }, - - /** - * Hilite all tokens within node using span with given className - * - * This first stores caret position, updates markup, and then restores the caret. - * - * @param {Node} node - * @param {Array} tokens - * @param {string} className - * @param {Boolean} preventStore - */ - hilite: function(node, tokens, className, preventStore) { - // remove old hilites - this.removeHilites(node); - - // create a clone - var hiliteNode = node.cloneNode(true); - - hiliteNode.classList.add(CLONE_CLASS); - - // generate hilite markup in clone - tokens.forEach((token) => { - this.hiliteToken(hiliteNode, token, className); - }); - - // render clone - node.parentNode.appendChild(hiliteNode); - }, - - /** - * Highlight single `token` via putting it into a span with given class - * - * @param {Node} node - * @param {Object} token - * @param {string} className - */ - hiliteToken: function(node, token, className) { - var start = this.findWordNode(node, token.index, token.word.length); - var replace = start.node.splitText(start.offset); - var span = document.createElement('span'); - - span.classList.add(className); - span.classList.add(HILITE_CLASS); - - if (token.active) { - span.classList.add(ACTIVE_CLASS); - } - - replace.splitText(token.word.length); - span.textContent = replace.textContent; - span.dataset.word = token.word; - span.dataset.index = token.index; - if (token.sentenceWord) { - span.dataset.sentenceWord = 'true'; - span.classList.add('sdCapitalize'); - } - replace.parentNode.replaceChild(span, replace); - }, - - /** - * Remove hilites node from nodes parent - * - * @param {Node} node - */ - removeHilites: function(node) { - var parentNode = node.parentNode; - var clones = parentNode.getElementsByClassName(CLONE_CLASS); - - if (clones.length) { - parentNode.removeChild(clones.item(0)); - } - }, - - /** - * Find text node within given node where word is located - * - * It will find text type node where the whole word is located - * - * @param {Node} node - * @param {Number} index - * @param {Number} length - * @return {Object} {node: {Node}, offset: {Number}} - */ - findWordNode: function(node, index, length) { - var start = findOffsetNode(node, index); - var end = findOffsetNode(node, index + length); - - // correction for linebreaks - first node on a new line is set to - // linebreak text node which is not even visible in dom, maybe dom bug? - if (start.node !== end.node) { - start.node = end.node; - start.offset = 0; - } - - return start; - }, - }; -} - -angular.module('superdesk.apps.editor2.utils', []) - .factory('editorUtils', EditorUtilsFactory); diff --git a/scripts/core/editor2/embedCodeHandlers.spec.ts b/scripts/core/editor2/embedCodeHandlers.spec.ts deleted file mode 100644 index efad3f1a7b..0000000000 --- a/scripts/core/editor2/embedCodeHandlers.spec.ts +++ /dev/null @@ -1,107 +0,0 @@ -import {ISuperdeskGlobalConfig} from 'superdesk-api'; -import {appConfig} from 'appConfig'; - -describe('Embed Code Handlers', () => { - var ctrl, scope; - - beforeEach(() => { - const testConfig: Partial = { - server: {url: undefined, ws: undefined}, - iframely: {key: '123'}, - editor: {}, - }; - - Object.assign(appConfig, testConfig); - }); - - beforeEach(window.module('superdesk.apps.editor2')); - beforeEach(window.module('superdesk.apps.vocabularies')); - beforeEach(window.module('superdesk.apps.searchProviders')); - - beforeEach(inject(($controller, $rootScope) => { - var element = angular.element('
'); - - scope = $rootScope.$new(); - ctrl = $controller('SdAddEmbedController', {$scope: scope, $element: element}); - })); - - it('match a twitter url', inject(($rootScope, $q, $httpBackend, embedService) => { - ctrl.input = 'https://twitter.com/letzi83/status/764062125996113921'; - jasmine.createSpy(embedService, 'get').and.returnValue($q.when({ - meta: {site: 'Twitter'}, - html: 'embed', - })); - $httpBackend.whenJSONP(/https:\/\/iframe\.ly\/api\/.*/).respond(400); - $httpBackend.whenGET(/https:\/\/iframe\.ly\/api\/.*/).respond(400); - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: 'embed', - provider: 'Twitter', - }); - }); - $rootScope.$digest(); - })); - - it('match a twitter embed', () => { - ctrl.input = '' + - ''; - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Twitter', - }); - }); - scope.$digest(); - }); - - it('match a vidible embed', inject(($httpBackend) => { - ctrl.input = '
' + - '
'; - // retrieve embed with Vidible disabled - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Custom', - }); - }); - scope.$digest(); - - const testConfig: Partial = { - editor: { - ...appConfig.editor, - // retrieve embed with Vidible enabled - vidible: true, - }, - }; - - Object.assign(appConfig, testConfig); - - var apiResponse = { - height: 360, - mimeType: 'video/ogg', - size: 2004079, - type: 'video', - url: 'http://delivery.vidible.tv/video/redirect/56bb4688e4b0b6448ed479dd' + - '?bcid=538612f0e4b00fbb8e898655&w=640&h=360', - width: 640, - }; - - $httpBackend - .expectGET(appConfig.server.url + '/vidible/bcid/538612f0e4b00fbb8e898655/pid/56bb474de4b0568f54a23ed7') - .respond(apiResponse); - ctrl.retrieveEmbed().then((d) => { - expect(d).toEqual({ - body: ctrl.input, - provider: 'Vidible', - association: apiResponse, - }); - }); - $httpBackend.flush(); - scope.$digest(); - })); -}); diff --git a/scripts/core/editor2/embedCodeHandlers.ts b/scripts/core/editor2/embedCodeHandlers.ts deleted file mode 100644 index 4bdfe6a19c..0000000000 --- a/scripts/core/editor2/embedCodeHandlers.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {appConfig} from 'appConfig'; - -export default [ - ['EMBED_PROVIDERS', function(EMBED_PROVIDERS) { - return { - pattern: /twitter\.com\/widgets\.js/g, - name: EMBED_PROVIDERS.twitter, - }; - }], - ['EMBED_PROVIDERS', function(EMBED_PROVIDERS) { - return { - pattern: /www\.youtube\.com/g, - name: EMBED_PROVIDERS.youtube, - }; - }], - ['EMBED_PROVIDERS', 'api', function(EMBED_PROVIDERS, api) { - return { - pattern: /src=".*vidible\.tv.*pid=(.+)\/(.+).js/g, - name: EMBED_PROVIDERS.vidible, - condition: () => appConfig.editor != null && appConfig.editor.vidible, - callback: (match) => api.get(`vidible/bcid/${match[2]}/pid/${match[1]}`) - .then((data) => ({association: data})), - }; - }], -]; diff --git a/scripts/core/editor2/index.ts b/scripts/core/editor2/index.ts deleted file mode 100644 index 185742c738..0000000000 --- a/scripts/core/editor2/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @ngdoc module - * @module superdesk.core.editor2 - * @name superdesk.core.editor2 - * @packageName superdesk.core - * @description Superdesk core editor version 2. - */ -import './styles/editor.scss'; - -import './editor'; -import './editor.ctrl'; -import './add-embed.ctrl'; -import './add-content'; diff --git a/scripts/core/editor2/styles/editor.scss b/scripts/core/editor2/styles/editor.scss deleted file mode 100644 index 2a8c51ad10..0000000000 --- a/scripts/core/editor2/styles/editor.scss +++ /dev/null @@ -1,245 +0,0 @@ -@import '~variables.scss'; -@import '~mixins.scss'; -@import "~sf-additional.scss"; - -.editor-type-html { - &:before{ - display: block; /* For Firefox */ - } - &:empty:before{ - content: attr(placeholder); - pointer-events: none; - display: block; /* For Firefox */ - color: rgba(150, 150, 150, 0.5) - } - &:focus:before{ - display: none; - } - // prevent chrome to add extra markup with style in contenteditable - span, p, h1, h2, h3, h4 { - background-color: transparent; - font-family: inherit; - } - - span, h3 { - font-size: inherit; - line-height: 150%; - } - - pre { - font-size: inherit; - line-height: 150%; - - span, h3 { - font-size: inherit; - line-height: 150%; - } - } -} - -.headline { - .editor-type-html { - span { - font-size: inherit; - line-height: 120%; - font-weight: 500; - } - } -} - -.dropdown__menu--suggestions { - font-size: 14px; - font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif; -} - -.medium-editor-toolbar { - z-index: 1020; - // disabled state for toolbar button - li .medium-editor-button-disabled { - background-color: gray; - cursor: default; - pointer-events: none; - } -} -.block { - // hide text field on mouse out when empty if not alone - &--not-alone-and-empty { - .text-editor:not(.medium-editor-dragover) { - opacity: 0; - @include transition(opacity .25s); - &:focus, &:hover { - opacity: 1; - } - } - } - &__container { - position: relative; - .text-editor { - padding: 0; - // leave the space for the `add-embed` when the toolbar is shown - margin-top: 6px; - &.medium-editor-dragover, & .medium-editor-dragover { - background: $sd-hover; - border: 2px dashed $sd-blue; - } - } - .preview--caption, .editor--caption { - margin: 0; - border: 1px solid rgba(150, 150, 150, 0.15); - input, select, textarea { - color: inherit; - } - } - .editor--caption [contenteditable] { - padding: 8px; - min-height: 18px; - } - .editor--embed { - min-height: 200px; - } - } - &__actions { - position: absolute; - right: -38px; - top: 0; - cursor: pointer; - opacity: .1; - i { - color: inherit; - } - & > div { - display: inline-block; - } - } - // shows actions on hover - &__container:hover .block__actions {opacity: 1;} -} -.add-content { // (+) button - position: absolute; - z-index: 1; - // translate the button by its dimension - transform: translate(-48px, -12px); - -moz-transform: translate(-48px, -12px); - -wekit-transform: translate(-48px, -12px); - &--expanded { - .add-content__plus-btn { - opacity: 1; - i {transform: rotate(45deg);} - } - .add-content__actions span { - transform: scale(1); - &:hover { - z-index: 1; // for sd-tooltip - } - } - } - &__plus-btn { - position: absolute; - opacity: .7; - &:hover { - opacity: 1; - } - i { - @include transition(transform .25s); - } - } - &__actions { - position: relative; - top: 10px; - left: 50px; - &.ng-hide:not(.ng-hide-animate) { - display: block !important; - position: absolute; - pointer-events: none; - width: 200px; // ensure that inner inline-block is inlined - } - span { - display: inline-block; - transform: scale(0); - @include transition(transform .25s); - &:nth-of-type(2) { - transition-delay: .1s; - -moz-transition-delay: .1s; - -webkit-transition-delay: .1s; - } - border-radius: 24px; - border: 2px solid $sd-blue; - padding: 5px 5px 0px; - background-color: $white; - i {color: $sd-blue;} - &:hover { - cursor: pointer; - background-color: $sd-blue; - i {color: $white;} - } - } - } -} -.add-embed { - &__body { - margin: 10px 0; - padding: 10px; - border: 1px solid $sd-blue; - @include border-radius(3px); - form { - position: relative; - } - } - &__input { - // leave place for action buttons on the sides - margin-right: 100px; - } - // action buttons - &__actions { - // align right - position: absolute; - top: 0; - right: 0; - // centers icons - i { - left: 2px; - position: relative; - } - } -} - -// Embed previews -.block__container .preview--embed, -.add-embed__body .preview { - &--loading { - min-height: 100px; - img { - opacity: .3; - } - &:before { - content: ''; - position: absolute; - top: 50%; - transform: translateY(-50%); - left: 0; - @include spinner-big; - } - } - text-align: center; - margin: 10px 0 0; - .instagram-media { - margin: auto !important; - } - iframe, video { - max-width: 100%; - } - img { - max-width: 100%; - height: auto; - &:hover { - cursor: pointer; - } - } - .embed--link { - &__title { - font-size: 1.75em; - line-height: 1.25em; - margin-bottom: .50em; - } - } -} diff --git a/scripts/core/editor2/views/add-content.html b/scripts/core/editor2/views/add-content.html deleted file mode 100644 index 6fb90bde61..0000000000 --- a/scripts/core/editor2/views/add-content.html +++ /dev/null @@ -1,25 +0,0 @@ -
- -
- - - - - - - - - -
-
diff --git a/scripts/core/editor2/views/add-embed.html b/scripts/core/editor2/views/add-embed.html deleted file mode 100644 index 03cc4c1cc6..0000000000 --- a/scripts/core/editor2/views/add-embed.html +++ /dev/null @@ -1,21 +0,0 @@ -
-
-
- -
-
- - -
-
{{:: 'loading' | translate }} ...
-
-
-
diff --git a/scripts/core/editor2/views/block-embed.html b/scripts/core/editor2/views/block-embed.html deleted file mode 100644 index 3c4c3229f7..0000000000 --- a/scripts/core/editor2/views/block-embed.html +++ /dev/null @@ -1,37 +0,0 @@ -
- - Cancel - Save -
-
-
-
- - -
-
- - -
diff --git a/scripts/core/editor2/views/block-text.html b/scripts/core/editor2/views/block-text.html deleted file mode 100644 index 12bdcd99ad..0000000000 --- a/scripts/core/editor2/views/block-text.html +++ /dev/null @@ -1,29 +0,0 @@ -
- - 
-
- -
-
- - Line: {{cursor.line}}, Column: {{cursor.column}} - - -
    -
    • -
    • -
  • -
    • -
    • -
-
diff --git a/scripts/core/editor2/views/editor.html b/scripts/core/editor2/views/editor.html deleted file mode 100644 index 5ea50f5dea..0000000000 --- a/scripts/core/editor2/views/editor.html +++ /dev/null @@ -1,45 +0,0 @@ -
- -
-
- -
-
- -
-
- - - - -
-
-
-
-
-
- - - -
diff --git a/scripts/core/editor3/index.ts b/scripts/core/editor3/index.ts index 2108cf11b0..7e4a8e7039 100644 --- a/scripts/core/editor3/index.ts +++ b/scripts/core/editor3/index.ts @@ -2,9 +2,6 @@ import './styles.scss'; import {EditorService} from './service'; import {sdEditor3} from './directive'; -import ng from 'core/services/ng'; -import {appConfig} from 'appConfig'; - /** * @ngdoc module * @module superdesk.core.editor3 @@ -14,14 +11,9 @@ import {appConfig} from 'appConfig'; */ export default angular.module('superdesk.core.editor3', ['superdesk.apps.spellcheck']) .service('editor3', EditorService) - .service('editorResolver', ['editor', 'editor3', function(editor2, editor3) { - // Enables the use of editor2 and editor3 in parallel. - // Resolves to old editor in case editor3 is inactive. + .service('editorResolver', ['editor3', function(editor3) { this.get = function() { - const authoring = ng.get('authoring'); - const editor3Active = authoring.editor && authoring.editor.body_html && authoring.editor.body_html.editor3; - - return appConfig.features.onlyEditor3 || editor3Active ? editor3 : editor2; + return editor3; }; }]) .directive('sdEditor3', sdEditor3); diff --git a/scripts/core/editor3/service.ts b/scripts/core/editor3/service.ts index 12e01b2aa1..34623b45f2 100644 --- a/scripts/core/editor3/service.ts +++ b/scripts/core/editor3/service.ts @@ -26,8 +26,7 @@ const spellcheckerStores = []; * @module superdesk.core.editor3 * @name editor3 * @description editor3 is the service that allows interacting with the editor from - * the outside. It uses the same interface as the editor service of core/editor2/editor.js - * to allow plugging one or the other based on the editor of the item being edited. + * the outside. */ export class EditorService { /** diff --git a/scripts/core/index.ts b/scripts/core/index.ts index 6d6353f140..ada8c3f6c3 100644 --- a/scripts/core/index.ts +++ b/scripts/core/index.ts @@ -13,7 +13,6 @@ import 'core/elastic'; import 'core/filters'; import 'core/services'; import 'core/directives'; -import 'core/editor2'; import 'core/spellcheck'; import 'core/editor3'; import 'core/features'; diff --git a/scripts/core/spellcheck/spellcheck.spec.ts b/scripts/core/spellcheck/spellcheck.spec.ts index 0b90131f81..caeec2c0e7 100644 --- a/scripts/core/spellcheck/spellcheck.spec.ts +++ b/scripts/core/spellcheck/spellcheck.spec.ts @@ -31,7 +31,6 @@ describe('spellcheck', () => { Object.assign(appConfig, testConfig); }); - beforeEach(window.module('superdesk.apps.editor2')); beforeEach(window.module('superdesk.core.editor3')); beforeEach(window.module('superdesk.apps.spellcheck')); beforeEach(window.module('superdesk.core.preferences')); diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 4946c26720..921549e1e1 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -1925,7 +1925,6 @@ declare module 'superdesk-api' { hideRoutedDesks?: any; autorefreshContent?: any; elasticHighlight?: any; - onlyEditor3?: any; nestedItemsInOutputStage?: boolean; keepMetaTermsOpenedOnClick?: boolean; showCharacterLimit?: number; diff --git a/scripts/index.ts b/scripts/index.ts index c1224f5834..28ef2748ef 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -6,8 +6,6 @@ import 'app.scss'; // styles import 'jquery-jcrop/css/jquery.Jcrop.css'; import 'jquery-ui/themes/smoothness/jquery-ui.css'; -import 'medium-editor/dist/css/medium-editor.css'; -import 'medium-editor-tables/dist/css/medium-editor-tables.css'; import 'owl.carousel/dist/assets/owl.carousel.min.css'; import 'superdesk-ui-framework/dist/superdesk-ui.bundle.css'; diff --git a/scripts/vendor.ts b/scripts/vendor.ts index 48a3fbfd6f..152b8aabe0 100644 --- a/scripts/vendor.ts +++ b/scripts/vendor.ts @@ -8,8 +8,6 @@ import 'angular'; import 'angular-resource'; import 'angular-route'; import 'angular-gettext'; -import 'angular-embedly'; -import 'angular-embed'; import 'angular-contenteditable'; import 'angular-vs-repeat'; import 'angular-moment'; diff --git a/styles/sass/app.scss b/styles/sass/app.scss index ec9b6f042a..b57a2a2fb5 100644 --- a/styles/sass/app.scss +++ b/styles/sass/app.scss @@ -52,7 +52,6 @@ // Components: Misc @import 'labels'; -@import 'medium-editor'; // custom skin for medium-editor @import 'sf-additional'; @import 'sf-icons'; @import 'search-list'; diff --git a/styles/sass/medium-editor.scss b/styles/sass/medium-editor.scss deleted file mode 100644 index 85a5b34a5b..0000000000 --- a/styles/sass/medium-editor.scss +++ /dev/null @@ -1,274 +0,0 @@ -@-webkit-keyframes medium-editor-image-loading { - 0% { - -webkit-transform: scale(0); - transform: scale(0); } - 100% { - -webkit-transform: scale(1); - transform: scale(1); } } - -@keyframes medium-editor-image-loading { - 0% { - -webkit-transform: scale(0); - transform: scale(0); } - 100% { - -webkit-transform: scale(1); - transform: scale(1); } } - -@-webkit-keyframes medium-editor-pop-upwards { - 0% { - opacity: 0; - -webkit-transform: matrix(0.97, 0, 0, 1, 0, 12); - transform: matrix(0.97, 0, 0, 1, 0, 12); } - 20% { - opacity: .7; - -webkit-transform: matrix(0.99, 0, 0, 1, 0, 2); - transform: matrix(0.99, 0, 0, 1, 0, 2); } - 40% { - opacity: 1; - -webkit-transform: matrix(1, 0, 0, 1, 0, -1); - transform: matrix(1, 0, 0, 1, 0, -1); } - 100% { - -webkit-transform: matrix(1, 0, 0, 1, 0, 0); - transform: matrix(1, 0, 0, 1, 0, 0); } } - -@keyframes medium-editor-pop-upwards { - 0% { - opacity: 0; - -webkit-transform: matrix(0.97, 0, 0, 1, 0, 12); - transform: matrix(0.97, 0, 0, 1, 0, 12); } - 20% { - opacity: .7; - -webkit-transform: matrix(0.99, 0, 0, 1, 0, 2); - transform: matrix(0.99, 0, 0, 1, 0, 2); } - 40% { - opacity: 1; - -webkit-transform: matrix(1, 0, 0, 1, 0, -1); - transform: matrix(1, 0, 0, 1, 0, -1); } - 100% { - -webkit-transform: matrix(1, 0, 0, 1, 0, 0); - transform: matrix(1, 0, 0, 1, 0, 0); } } - -.medium-editor-anchor-preview { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 16px; - left: 0; - line-height: 1.4; - max-width: 280px; - position: absolute; - text-align: center; - top: 0; - word-break: break-all; - word-wrap: break-word; - visibility: hidden; - z-index: 2000; } - .medium-editor-anchor-preview a { - color: $white; - display: inline-block; - margin: 5px 5px 10px; } - -.medium-editor-anchor-preview-active { - visibility: visible; } - -.medium-editor-dragover { - background: #ddd; } - -.medium-editor-image-loading { - -webkit-animation: medium-editor-image-loading 1s infinite ease-in-out; - animation: medium-editor-image-loading 1s infinite ease-in-out; - background-color: #333; - border-radius: 100%; - display: inline-block; - height: 40px; - width: 40px; } - -.medium-editor-placeholder { - position: relative; } - .medium-editor-placeholder:after { - content: attr(data-placeholder) !important; - font-style: italic; - left: 0; - position: absolute; - top: 0; - white-space: pre; - padding: inherit; - margin: inherit; } - -.medium-toolbar-arrow-under:after, .medium-toolbar-arrow-over:before { - border-style: solid; - content: ''; - display: block; - height: 0; - left: 50%; - margin-left: -8px; - position: absolute; - width: 0; } - -.medium-toolbar-arrow-under:after { - border-width: 8px 8px 0 8px; } - -.medium-toolbar-arrow-over:before { - border-width: 0 8px 8px 8px; - top: -8px; } - -.medium-editor-toolbar { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 16px; - left: 0; - position: absolute; - top: 0; - visibility: hidden; - z-index: 9999; } - .medium-editor-toolbar ul { - margin: 0; - padding: 0; } - .medium-editor-toolbar li { - float: left; - list-style: none; - margin: 0; - padding: 0; } - .medium-editor-toolbar li button { - box-sizing: border-box; - cursor: pointer; - display: block; - font-size: 14px; - line-height: 1; - margin: 0; - padding: 15px; - text-decoration: none; } - .medium-editor-toolbar li button:focus { - outline: none; } - .medium-editor-toolbar li .medium-editor-action-underline { - text-decoration: underline; } - .medium-editor-toolbar li .medium-editor-action-pre { - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; - font-size: 12px; - font-weight: 100; - padding: 15px 0; } - -.medium-editor-toolbar-active { - visibility: visible; } - -.medium-editor-sticky-toolbar { - position: fixed; - top: 1px; } - -.medium-editor-relative-toolbar { - position: relative; } - -.medium-editor-toolbar-active.medium-editor-stalker-toolbar { - -webkit-animation: medium-editor-pop-upwards 160ms forwards linear; - animation: medium-editor-pop-upwards 160ms forwards linear; } - -.medium-editor-action-bold { - font-weight: bolder; } - -.medium-editor-action-italic { - font-style: italic; } - -.medium-editor-toolbar-form { - display: none; } - .medium-editor-toolbar-form input, - .medium-editor-toolbar-form a { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } - .medium-editor-toolbar-form .medium-editor-toolbar-form-row { - line-height: 14px; - margin-left: 5px; - padding-bottom: 5px; } - .medium-editor-toolbar-form .medium-editor-toolbar-input, - .medium-editor-toolbar-form label { - border: none; - box-sizing: border-box; - font-size: 14px; - margin: 0; - padding: 6px; - width: 316px; - display: inline-block; } - .medium-editor-toolbar-form .medium-editor-toolbar-input:focus, - .medium-editor-toolbar-form label:focus { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - border: none; - box-shadow: none; - outline: 0; } - .medium-editor-toolbar-form a { - display: inline-block; - font-size: 24px; - font-weight: bolder; - margin: 0 10px; - text-decoration: none; } - -.medium-editor-toolbar-actions:after { - clear: both; - content: ""; - display: table; } - -[data-medium-editor-element] img { - max-width: 100%; } - -[data-medium-editor-element] sub { - vertical-align: sub; } - -[data-medium-editor-element] sup { - vertical-align: super; } - -.medium-editor-hidden { - display: none; } -.medium-toolbar-arrow-under:after { -top: 60px; -border-color: $sd-blue transparent transparent transparent; } - -.medium-toolbar-arrow-over:before { -top: -8px; -border-color: transparent transparent $sd-blue transparent; } - -.medium-editor-toolbar { -background-color: $sd-blue; } -.medium-editor-toolbar li { - padding: 0; } - .medium-editor-toolbar li button { - min-width: 60px; - height: 60px; - border: none; - border-right: 1px solid $sd-background; - background-color: transparent; - color: $white; - -webkit-transition: background-color .2s ease-in, color .2s ease-in; - transition: background-color .2s ease-in, color .2s ease-in; } - .medium-editor-toolbar li button:hover { - background-color: darken($sd-blue, 20%); - color: $white; } - .medium-editor-toolbar li .medium-editor-button-active { - background-color: darken($sd-blue, 30%); - color: $white; } - .medium-editor-toolbar li .medium-editor-button-last { - border-right: none; } - -.medium-editor-toolbar-form .medium-editor-toolbar-input { -height: 60px; -background: $sd-blue; -color: $white; } -.medium-editor-toolbar-form .medium-editor-toolbar-input::-webkit-input-placeholder { - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input:-moz-placeholder { - /* Firefox 18- */ - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input::-moz-placeholder { - /* Firefox 19+ */ - color: $white; - color: rgba(255, 255, 255, 0.8); } -.medium-editor-toolbar-form .medium-editor-toolbar-input:-ms-input-placeholder { - color: $white; - color: rgba(255, 255, 255, 0.8); } - -.medium-editor-toolbar-form a { -color: $white; } - -.medium-editor-toolbar-anchor-preview { -background: $sd-blue; -color: $white; } - -.medium-editor-placeholder:after { -color: $white; } diff --git a/webpack.config.js b/webpack.config.js index a913a6115d..bd84a37f32 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -46,9 +46,6 @@ module.exports = function makeConfig(grunt) { jQuery: jQueryModule, 'window.jQuery': jQueryModule, moment: 'moment', - // MediumEditor needs to be globally available, because - // its plugins will not be able to find it otherwise. - MediumEditor: 'medium-editor', }), new webpack.DefinePlugin({ __SUPERDESK_CONFIG__: JSON.stringify(sdConfig), @@ -68,7 +65,6 @@ module.exports = function makeConfig(grunt) { alias: { 'moment-timezone': 'moment-timezone/builds/moment-timezone-with-data-2012-2022', 'rangy-saverestore': 'rangy/lib/rangy-selectionsaverestore', - 'angular-embedly': 'angular-embedly/em-minified/angular-embedly.min', 'jquery-gridster': 'gridster/dist/jquery.gridster.min', 'external-apps': path.join(process.cwd(), 'dist', 'app-importer.generated.js'), }, @@ -231,9 +227,6 @@ function getDefaults(grunt) { features: { // tansa spellchecker useTansaProofing: false, - - // replace editor2 - onlyEditor3: false, }, // workspace defaults From 471d158237d458c3ef37296232c83603fc225ee1 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 25 Oct 2021 11:48:40 +0200 Subject: [PATCH 0088/1070] restore angular embed --- package-lock.json | 2463 ++++++++++++++++- package.json | 2 + scripts/apps/authoring/authoring/index.ts | 11 +- scripts/apps/authoring/macros/macros.spec.ts | 1 + .../apps/authoring/tests/authoring.spec.ts | 1 + scripts/vendor.ts | 2 + webpack.config.js | 1 + 7 files changed, 2356 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b24f524d3..dfb25cfd32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "requires": { "@babel/highlight": "^7.14.5" } @@ -61,9 +61,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==" + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==" }, "@babel/runtime": { "version": "7.15.4", @@ -351,9 +351,9 @@ "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, "@types/glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", "dev": true, "requires": { "@types/minimatch": "*", @@ -404,9 +404,9 @@ } }, "@types/node": { - "version": "16.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.2.tgz", - "integrity": "sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ==" + "version": "16.11.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.3.tgz", + "integrity": "sha512-aIYL9Eemcecs1y77XzFGiSc+FdfN58k4J23UEe6+hynf4Wd9g4DzQPwIKL080vSMuubFqy2hWwOzCtJdc6vFKw==" }, "@types/parse5": { "version": "5.0.3", @@ -456,9 +456,9 @@ } }, "@types/webpack-env": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.2.tgz", - "integrity": "sha512-vKx7WNQNZDyJveYcHAm9ZxhqSGLYwoyLhrHjLBOkw3a7cT76sTdjgtwyijhk1MaHyRIuSztcVwrUOO/NEu68Dw==", + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz", + "integrity": "sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==", "dev": true }, "@typescript-eslint/experimental-utils": { @@ -540,6 +540,14 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, + "active-x-obfuscator": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz", + "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=", + "requires": { + "zeparser": "0.0.5" + } + }, "addressparser": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz", @@ -688,6 +696,108 @@ "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.32.tgz", "integrity": "sha1-0H/qdSgfJbqUpb5bRt8qAsXjWDY=" }, + "angular-embed": { + "version": "github:superdesk/angular-embed#d75968e9eedc2b255f68d0c298a6c91981bc9444", + "from": "github:superdesk/angular-embed#d75968e" + }, + "angular-embedly": { + "version": "github:Urigo/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", + "from": "github:Urigo/angular-embedly#0.0.8", + "requires": { + "gulp": "~3.8.2", + "gulp-concat": "~2.2.0", + "gulp-uglify": "~0.3.1", + "karma": "~0.12.16", + "karma-chrome-launcher": "~0.1.4", + "karma-jasmine": "~0.1.5" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "karma": { + "version": "0.12.37", + "resolved": "https://registry.npmjs.org/karma/-/karma-0.12.37.tgz", + "integrity": "sha1-Gp9/3szWneLoNeBO26wuzT+mReQ=", + "requires": { + "chokidar": "^1.0.1", + "colors": "^1.1.0", + "connect": "^2.29.2", + "di": "^0.0.1", + "glob": "^5.0.6", + "graceful-fs": "^3.0.6", + "http-proxy": "^0.10", + "lodash": "^3.8.0", + "log4js": "^0.6.25", + "mime": "^1.3.4", + "minimatch": "^2.0.7", + "optimist": "^0.6.1", + "q": "^1.4.1", + "rimraf": "^2.3.3", + "socket.io": "0.9.16", + "source-map": "^0.4.2", + "useragent": "^2.1.6" + } + }, + "karma-chrome-launcher": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.12.tgz", + "integrity": "sha1-CsDiLlc2UPZUExL9ynlcOCTM+WI=", + "requires": { + "which": "^1.0.9" + } + }, + "karma-jasmine": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.6.tgz", + "integrity": "sha1-MFRQV2mOvcvGMTLUe+Elt1svvFU=" + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "^1.0.0" + } + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "angular-gettext": { "version": "github:tomaskikutis/angular-gettext#5615f0058ecf7f4aeeb7ec1a24e2cff4426fffa6", "from": "github:tomaskikutis/angular-gettext#master" @@ -749,16 +859,135 @@ "type-fest": "^0.21.3" } }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "requires": { + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "requires": { + "arr-flatten": "^1.0.1" + } + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "requires": { + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "requires": { + "is-posix-bracket": "^0.1.0" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "requires": { + "is-extglob": "^1.0.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "requires": { + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" + } + } + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, "are-we-there-yet": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", @@ -825,6 +1054,11 @@ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" }, + "array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" + }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -847,6 +1081,11 @@ "is-string": "^1.0.7" } }, + "array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -1035,6 +1274,11 @@ "postcss-value-parser": "^3.2.3" } }, + "available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1225,6 +1469,26 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, + "base64-url": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", + "integrity": "sha1-GZ/WYXAqDnt9yubgaYuwicUvbXg=" + }, + "base64id": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", + "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=" + }, + "basic-auth": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz", + "integrity": "sha1-Awk1sB3nyblKgksp8/zLdQ06UpA=" + }, + "basic-auth-connect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", + "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI=" + }, "batch": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", @@ -1238,6 +1502,11 @@ "tweetnacl": "^0.14.3" } }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" + }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1368,6 +1637,38 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" }, + "body-parser": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", + "integrity": "sha1-wIzzMMM1jhUQFqBXRvE/ApyX+pc=", + "requires": { + "bytes": "2.1.0", + "content-type": "~1.0.1", + "debug": "~2.2.0", + "depd": "~1.0.1", + "http-errors": "~1.3.1", + "iconv-lite": "0.4.11", + "on-finished": "~2.3.0", + "qs": "4.0.0", + "raw-body": "~2.1.2", + "type-is": "~1.6.6" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -1748,9 +2049,9 @@ } }, "caniuse-db": { - "version": "1.0.30001264", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001264.tgz", - "integrity": "sha512-KwFcCSAaHNukq2lVN/rkxbagGmQKHNwBHZj5ThnEP0bqAIJdIk9pULCbkL9rs0Nf4RSI0zTzl4fmsTg1Pp0Jdg==" + "version": "1.0.30001271", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001271.tgz", + "integrity": "sha512-V7/O06sNu6e54ArdzLA1xFuYJ+kK9XXsO4pYa53ixujAVX/OVCGvDfRICSgkxdk8pdMZ+tA1v5ylLKDHNwUqEg==" }, "caseless": { "version": "0.12.0", @@ -1766,6 +2067,18 @@ "lazy-cache": "^1.0.3" } }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "requires": { + "ansi-styles": "^1.1.0", + "escape-string-regexp": "^1.0.0", + "has-ansi": "^0.1.0", + "strip-ansi": "^0.3.0", + "supports-color": "^0.2.0" + } + }, "change-case": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz", @@ -1879,9 +2192,9 @@ } }, "css-what": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", - "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", "dev": true }, "dom-serializer": { @@ -1938,6 +2251,37 @@ } } }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "requires": { + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -2120,6 +2464,11 @@ } } }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, "clsx": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", @@ -2188,6 +2537,11 @@ "color-name": "^1.0.0" } }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", @@ -2201,8 +2555,7 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, "combine-lists": { "version": "1.0.1", @@ -2221,6 +2574,11 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=" + }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -2323,11 +2681,90 @@ } } }, + "connect": { + "version": "2.30.2", + "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", + "integrity": "sha1-jam8vooFTT0xjXTf7JA7XDmhtgk=", + "requires": { + "basic-auth-connect": "1.0.0", + "body-parser": "~1.13.3", + "bytes": "2.1.0", + "compression": "~1.5.2", + "connect-timeout": "~1.6.2", + "content-type": "~1.0.1", + "cookie": "0.1.3", + "cookie-parser": "~1.3.5", + "cookie-signature": "1.0.6", + "csurf": "~1.8.3", + "debug": "~2.2.0", + "depd": "~1.0.1", + "errorhandler": "~1.4.2", + "express-session": "~1.11.3", + "finalhandler": "0.4.0", + "fresh": "0.3.0", + "http-errors": "~1.3.1", + "method-override": "~2.3.5", + "morgan": "~1.6.1", + "multiparty": "3.3.2", + "on-headers": "~1.0.0", + "parseurl": "~1.3.0", + "pause": "0.1.0", + "qs": "4.0.0", + "response-time": "~2.3.1", + "serve-favicon": "~2.3.0", + "serve-index": "~1.7.2", + "serve-static": "~1.10.0", + "type-is": "~1.6.6", + "utils-merge": "1.0.0", + "vhost": "~3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "connect-history-api-fallback": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, + "connect-timeout": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", + "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=", + "requires": { + "debug": "~2.2.0", + "http-errors": "~1.3.1", + "ms": "0.7.1", + "on-headers": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", @@ -2373,6 +2810,20 @@ "safe-buffer": "~5.1.1" } }, + "cookie": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", + "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=" + }, + "cookie-parser": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", + "integrity": "sha1-nXVVcPtdF4kHcSJ6AjFNm+fPg1Y=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6" + } + }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -2393,6 +2844,11 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "crc": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", + "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=" + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -2515,6 +2971,16 @@ } } }, + "csrf": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz", + "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=", + "requires": { + "rndm": "1.2.0", + "tsscmp": "1.0.5", + "uid-safe": "2.1.4" + } + }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -2644,6 +3110,17 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" }, + "csurf": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", + "integrity": "sha1-I/KhO/HY/OHQyZZYg5RELLqGpWo=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6", + "csrf": "~3.0.0", + "http-errors": "~1.3.1" + } + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2698,6 +3175,11 @@ "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", "dev": true }, + "dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -2721,6 +3203,35 @@ "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz", "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=" }, + "deep-equal": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz", + "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==", + "requires": { + "call-bind": "^1.0.0", + "es-get-iterator": "^1.1.1", + "get-intrinsic": "^1.0.1", + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.2", + "is-regex": "^1.1.1", + "isarray": "^2.0.5", + "object-is": "^1.1.4", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "regexp.prototype.flags": "^1.3.0", + "side-channel": "^1.0.3", + "which-boxed-primitive": "^1.0.1", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.2" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + } + } + }, "deep-for-each": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-1.0.6.tgz", @@ -2734,6 +3245,19 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, + "deepmerge": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz", + "integrity": "sha1-iQa/nlJaT78bIDsq/LRkAkmCEhk=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "^1.0.2" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -2835,6 +3359,16 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, + "depd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", + "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=" + }, + "deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" + }, "des.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", @@ -2849,6 +3383,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" + }, "detect-node": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", @@ -2857,8 +3396,7 @@ "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=" }, "diff": { "version": "3.5.0", @@ -3032,6 +3570,14 @@ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.4.0.tgz", "integrity": "sha512-8s9FFuKC+lOWGwJ0b3om2PF+uXrqQPaEQlPJI7UxdzxTYGMeKouMPA9+YlPn52zcAVElIZtd2tXj6eQmvlKelw==" }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "requires": { + "readable-stream": "~1.1.9" + } + }, "each-async": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz", @@ -3070,9 +3616,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.859", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.859.tgz", - "integrity": "sha512-gXRXKNWedfdiKIzwr0Mg/VGCvxXzy+4SuK9hp1BDvfbCwx0O5Ot+2f4CoqQkqEJ3Zj/eAV/GoAFgBVFgkBLXuQ==" + "version": "1.3.877", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.877.tgz", + "integrity": "sha512-fT5mW5Giw5iyVukeHb2XvB4joBKvzHtl8Vs3QzE7APATpFMt/T7RWyUcIKSZzYkKQgpMbu+vDBTCHfQZvh8klA==" }, "elliptic": { "version": "6.5.4", @@ -3128,6 +3674,24 @@ } } }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "requires": { + "once": "~1.3.0" + }, + "dependencies": { + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1" + } + } + } + }, "engine.io": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz", @@ -3525,6 +4089,31 @@ "is-arrayish": "^0.2.1" } }, + "errorhandler": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz", + "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=", + "requires": { + "accepts": "~1.3.0", + "escape-html": "~1.0.3" + }, + "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + } + } + }, "es-abstract": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", @@ -3558,6 +4147,28 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, + "es-get-iterator": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", + "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.0", + "has-symbols": "^1.0.1", + "is-arguments": "^1.1.0", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.5", + "isarray": "^2.0.5" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + } + } + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -3963,6 +4574,11 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, + "etag": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", + "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=" + }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -4196,6 +4812,14 @@ } } }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -4417,6 +5041,45 @@ } } }, + "express-session": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", + "integrity": "sha1-XMmPP1/4Ttg1+Ry/CqvQxxB0AK8=", + "requires": { + "cookie": "0.1.3", + "cookie-signature": "1.0.6", + "crc": "3.3.0", + "debug": "~2.2.0", + "depd": "~1.0.1", + "on-headers": "~1.0.0", + "parseurl": "~1.3.0", + "uid-safe": "~2.0.0", + "utils-merge": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + }, + "uid-safe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", + "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=", + "requires": { + "base64-url": "1.2.1" + } + } + } + }, "ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -4571,6 +5234,17 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, + "fancy-log": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", + "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", + "requires": { + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" + } + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4699,6 +5373,42 @@ } } }, + "finalhandler": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", + "integrity": "sha1-llpS2ejQXSuFdUhUH7ibU6JJfZs=", + "requires": { + "debug": "~2.2.0", + "escape-html": "1.0.2", + "on-finished": "~2.3.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "escape-html": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", + "integrity": "sha1-130y+pjjjC9BroXpJ44ODmuhAiw=" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" + }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -4734,6 +5444,49 @@ } } }, + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "fined": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", + "requires": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flagged-respawn": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" + }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -4782,6 +5535,11 @@ "for-in": "^1.0.1" } }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -4810,6 +5568,11 @@ "map-cache": "^0.2.2" } }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=" + }, "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -4841,6 +5604,24 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "dependencies": { + "nan": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", + "optional": true + } + } + }, "fstream": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", @@ -4951,6 +5732,14 @@ } } }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "requires": { + "globule": "~0.1.0" + } + }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -5173,16 +5962,108 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "^1.0.0" + } + } + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "requires": { + "glob": "^4.3.1", + "glob2base": "^0.0.12", + "minimatch": "^2.0.1", + "ordered-read-streams": "^0.1.0", + "through2": "^0.6.1", + "unique-stream": "^1.0.0" + }, + "dependencies": { + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^2.0.1", + "once": "^1.3.0" + } + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "^1.0.0" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { - "is-extglob": "^1.0.0" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" } } } }, + "glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "requires": { + "gaze": "^0.5.1" + } + }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "requires": { + "find-index": "^0.1.1" + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -5207,6 +6088,68 @@ } } }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "requires": { + "glob": "~3.1.21", + "lodash": "~1.0.1", + "minimatch": "~0.2.11" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "requires": { + "graceful-fs": "~1.2.0", + "inherits": "1", + "minimatch": "~0.2.11" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" + }, + "inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" + }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" + }, + "minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "requires": { + "lru-cache": "2", + "sigmund": "~1.0.0" + } + } + } + }, + "glogg": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", + "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", + "requires": { + "sparkles": "^1.0.0" + } + }, + "graceful-fs": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz", + "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==", + "requires": { + "natives": "^1.1.3" + } + }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", @@ -5695,6 +6638,265 @@ "lodash": "^4.7.0" } }, + "gulp": { + "version": "3.8.11", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz", + "integrity": "sha1-1Vfgpyg+tBNkkZabBJd2eXLx0oo=", + "requires": { + "archy": "^1.0.0", + "chalk": "^0.5.0", + "deprecated": "^0.0.1", + "gulp-util": "^3.0.0", + "interpret": "^0.3.2", + "liftoff": "^2.0.1", + "minimist": "^1.1.0", + "orchestrator": "^0.3.0", + "pretty-hrtime": "^0.2.0", + "semver": "^4.1.0", + "tildify": "^1.0.0", + "v8flags": "^2.0.2", + "vinyl-fs": "^0.3.0" + }, + "dependencies": { + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + } + } + }, + "gulp-concat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.2.0.tgz", + "integrity": "sha1-7vw+FYDEzKxkOAbSBnwyK0QaY0Y=", + "requires": { + "gulp-util": "^2.2.5", + "through": "^2.3.4" + }, + "dependencies": { + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "requires": { + "get-stdin": "^4.0.1", + "meow": "^3.3.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "requires": { + "chalk": "^0.5.0", + "dateformat": "^1.0.7-1.2.3", + "lodash._reinterpolate": "^2.4.1", + "lodash.template": "^2.4.1", + "minimist": "^0.2.0", + "multipipe": "^0.1.0", + "through2": "^0.5.0", + "vinyl": "^0.2.1" + } + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", + "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=" + }, + "lodash.escape": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "requires": { + "lodash._escapehtmlchar": "~2.4.1", + "lodash._reunescapedhtml": "~2.4.1", + "lodash.keys": "~2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "requires": { + "lodash._escapestringchar": "~2.4.1", + "lodash._reinterpolate": "~2.4.1", + "lodash.defaults": "~2.4.1", + "lodash.escape": "~2.4.1", + "lodash.keys": "~2.4.1", + "lodash.templatesettings": "~2.4.1", + "lodash.values": "~2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "requires": { + "lodash._reinterpolate": "~2.4.1", + "lodash.escape": "~2.4.1" + } + }, + "minimist": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", + "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "requires": { + "readable-stream": "~1.0.17", + "xtend": "~3.0.0" + } + }, + "vinyl": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", + "requires": { + "clone-stats": "~0.0.1" + } + }, + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=" + } + } + }, + "gulp-uglify": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-0.3.2.tgz", + "integrity": "sha1-+je/bUrZopo0nGy6hiq7Iuumeqw=", + "requires": { + "deepmerge": ">=0.2.7 <0.3.0-0", + "gulp-util": ">=3.0.0 <4.0.0-0", + "through2": ">=0.6.1 <1.0.0-0", + "uglify-js": "2.4.6" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + } + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "requires": { + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", + "replace-ext": "0.0.1", + "through2": "^2.0.0", + "vinyl": "^0.5.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "requires": { + "glogg": "^1.0.0" + } + }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", @@ -5722,6 +6924,14 @@ "function-bind": "^1.1.1" } }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "requires": { + "ansi-regex": "^0.2.0" + } + }, "has-bigints": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", @@ -5760,6 +6970,14 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "requires": { + "sparkles": "^1.0.0" + } + }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -5923,6 +7141,14 @@ "react-is": "^16.7.0" } }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "requires": { + "parse-passwd": "^1.0.0" + } + }, "hooker": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", @@ -6006,9 +7232,9 @@ }, "dependencies": { "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", "requires": { "source-map": "~0.6.0" } @@ -6162,6 +7388,38 @@ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" }, + "http-proxy": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz", + "integrity": "sha1-FLoM6qIZf4n6MN6p57CeGc2Twi8=", + "requires": { + "colors": "0.x.x", + "optimist": "0.6.x", + "pkginfo": "0.3.x", + "utile": "~0.2.1" + }, + "dependencies": { + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + } + } + }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", @@ -6382,6 +7640,16 @@ } } }, + "i": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz", + "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==" + }, + "iconv-lite": { + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", + "integrity": "sha1-LstC/SlHRJIiCaLnxATayHk9it4=" + }, "icss-replace-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", @@ -6531,6 +7799,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, "inquirer": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", @@ -6627,6 +7900,11 @@ "side-channel": "^1.0.4" } }, + "interpret": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz", + "integrity": "sha1-CIwl3nMcbFsRKpDwBxz69Fnlp7s=" + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -6650,6 +7928,15 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, + "is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "requires": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + } + }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -6731,9 +8018,9 @@ } }, "is-core-module": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz", - "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "requires": { "has": "^1.0.3" } @@ -6830,6 +8117,11 @@ "lower-case": "^1.1.0" } }, + "is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" + }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -6942,12 +8234,25 @@ "has-tostringtag": "^1.0.0" } }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "requires": { + "is-unc-path": "^1.0.0" + } + }, "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" + }, "is-shared-array-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", @@ -6988,11 +8293,31 @@ "has-symbols": "^1.0.2" } }, + "is-typed-array": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz", + "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==", + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-abstract": "^1.18.5", + "foreach": "^2.0.5", + "has-tostringtag": "^1.0.0" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "requires": { + "unc-path-regex": "^0.1.2" + } + }, "is-upper-case": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", @@ -7006,6 +8331,11 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, + "is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" + }, "is-weakref": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", @@ -7014,6 +8344,11 @@ "call-bind": "^1.0.0" } }, + "is-weakset": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz", + "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -7027,9 +8362,7 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true, - "optional": true + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, "isbinaryfile": { "version": "3.0.3", @@ -7406,16 +8739,6 @@ "unpipe": "~1.0.0" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -7814,6 +9137,21 @@ "dev": true, "optional": true }, + "liftoff": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", + "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "requires": { + "extend": "^3.0.0", + "findup-sync": "^2.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" + } + }, "load-grunt-config": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/load-grunt-config/-/load-grunt-config-0.19.2.tgz", @@ -7950,6 +9288,108 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "lodash._escapehtmlchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", + "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", + "requires": { + "lodash._htmlescapes": "~2.4.1" + } + }, + "lodash._escapestringchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", + "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=" + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "lodash._htmlescapes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", + "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "lodash._isnative": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", + "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=" + }, + "lodash._objecttypes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", + "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=" + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash._reunescapedhtml": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", + "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", + "requires": { + "lodash._htmlescapes": "~2.4.1", + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "lodash._shimkeys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", + "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", + "requires": { + "lodash._objecttypes": "~2.4.1" + } + }, "lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", @@ -7970,6 +9410,35 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, + "lodash.defaults": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", + "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", + "requires": { + "lodash._objecttypes": "~2.4.1", + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "requires": { + "lodash._root": "^3.0.0" + } + }, "lodash.filter": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", @@ -7991,12 +9460,40 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "requires": { + "lodash._objecttypes": "~2.4.1" + } + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "requires": { + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" + } + }, "lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", @@ -8027,6 +9524,11 @@ "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", @@ -8037,6 +9539,31 @@ "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=" }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "requires": { + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "requires": { + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" + } + }, "lodash.unescape": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", @@ -8048,6 +9575,53 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, + "lodash.values": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", + "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", + "requires": { + "lodash.keys": "~2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "~2.4.1", + "lodash._shimkeys": "~2.4.1", + "lodash.isobject": "~2.4.1" + } + } + } + }, + "log4js": { + "version": "0.6.38", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", + "requires": { + "readable-stream": "~1.0.2", + "semver": "~4.3.3" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + } + } + }, "loggly": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz", @@ -8297,6 +9871,11 @@ "lower-case": "^1.1.2" } }, + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + }, "mailcomposer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz", @@ -8355,6 +9934,14 @@ } } }, + "make-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", + "requires": { + "kind-of": "^6.0.2" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -8485,6 +10072,37 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, + "method-override": { + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz", + "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=", + "requires": { + "debug": "2.6.9", + "methods": "~1.1.2", + "parseurl": "~1.3.2", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + } + } + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -8639,6 +10257,33 @@ "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==", "dev": true }, + "morgan": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", + "integrity": "sha1-X9gYOYxoGcuiinzWZk8pL+HAu/I=", + "requires": { + "basic-auth": "~1.0.3", + "debug": "~2.2.0", + "depd": "~1.0.1", + "on-finished": "~2.3.0", + "on-headers": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -8669,11 +10314,33 @@ "minimatch": "^3.0.0" } }, + "multiparty": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", + "integrity": "sha1-Nd5oBNwZZD5SSfPT473GyM4wHT8=", + "requires": { + "readable-stream": "~1.1.9", + "stream-counter": "~0.2.0" + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "requires": { + "duplexer2": "0.0.2" + } + }, "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=" + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -8692,6 +10359,11 @@ "to-regex": "^3.0.1" } }, + "natives": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", + "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -8705,6 +10377,11 @@ "xml-char-classes": "^1.0.0" } }, + "ncp": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", + "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=" + }, "nearley": { "version": "2.20.1", "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", @@ -9247,6 +10924,11 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, "object-component": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", @@ -9319,6 +11001,17 @@ "object-keys": "^1.1.1" } }, + "object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "requires": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + } + }, "object.entries": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", @@ -9339,6 +11032,15 @@ "es-abstract": "^1.19.1" } }, + "object.map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, "object.omit": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", @@ -9418,6 +11120,14 @@ "is-wsl": "^1.1.0" } }, + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "requires": { + "wordwrap": "~0.0.2" + } + }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -9431,6 +11141,26 @@ "word-wrap": "~1.2.3" } }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=" + }, + "orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "requires": { + "end-of-stream": "~0.1.5", + "sequencify": "~0.0.7", + "stream-consume": "~0.1.0" + } + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" + }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -9650,6 +11380,16 @@ "safe-buffer": "^5.1.1" } }, + "parse-filepath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "requires": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + } + }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -9684,6 +11424,16 @@ "error-ex": "^1.2.0" } }, + "parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -9858,6 +11608,19 @@ } } }, + "path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "requires": { + "path-root-regex": "^0.1.0" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -9880,6 +11643,11 @@ } } }, + "pause": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", + "integrity": "sha1-68ikqGGf8LioGsFRPDQ0/0af23Q=" + }, "pbkdf2": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", @@ -9947,6 +11715,11 @@ "find-up": "^1.0.0" } }, + "pkginfo": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", + "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=" + }, "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", @@ -9967,6 +11740,11 @@ "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.11.tgz", "integrity": "sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg==" }, + "policyfile": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz", + "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0=" + }, "popper.js": { "version": "1.14.4", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", @@ -10588,6 +12366,11 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, + "pretty-hrtime": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz", + "integrity": "sha1-1P2INR46R0H4Fzr31qS4RvmJXAA=" + }, "primeicons": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-2.0.0.tgz", @@ -10804,6 +12587,11 @@ "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", "dev": true }, + "qs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", + "integrity": "sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=" + }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", @@ -10860,6 +12648,11 @@ "ret": "~0.1.10" } }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" + }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -10909,6 +12702,28 @@ "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.22.3.tgz", "integrity": "sha512-pIzHpAggyTOGJE3ruAKdZNK5qhO4V21kR7lwpdUM875yHpq1cqeGzvs78/RufF3g7NaAvVmMPCbaV9uUhQzJ3A==" }, + "raw-body": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=", + "requires": { + "bytes": "2.4.0", + "iconv-lite": "0.4.13", + "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=" + }, + "iconv-lite": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=" + } + } + }, "react": { "version": "16.9.0", "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", @@ -11228,8 +13043,6 @@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -11316,6 +13129,12 @@ "strip-indent": "^1.0.1" } }, + "redis": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz", + "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=", + "optional": true + }, "redis-commands": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", @@ -11479,6 +13298,11 @@ "is-finite": "^1.0.0" } }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -11596,6 +13420,15 @@ } } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -11616,11 +13449,27 @@ } } }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "response-time": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", + "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", + "requires": { + "depd": "~1.1.0", + "on-headers": "~1.0.1" + }, + "dependencies": { + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + } + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -11660,6 +13509,11 @@ "inherits": "^2.0.1" } }, + "rndm": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", + "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" + }, "rst-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", @@ -11927,6 +13781,55 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, + "send": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", + "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=", + "requires": { + "debug": "~2.2.0", + "depd": "~1.1.0", + "destroy": "~1.0.4", + "escape-html": "~1.0.3", + "etag": "~1.7.0", + "fresh": "0.3.0", + "http-errors": "~1.3.1", + "mime": "1.3.4", + "ms": "0.7.1", + "on-finished": "~2.3.0", + "range-parser": "~1.0.3", + "statuses": "~1.2.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "requires": { + "ms": "0.7.1" + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + }, + "statuses": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", + "integrity": "sha1-3e1FzBglbVHtQK7BQkidXGECbSg=" + } + } + }, "sentence-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz", @@ -11936,6 +13839,29 @@ "upper-case-first": "^1.1.2" } }, + "sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" + }, + "serve-favicon": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz", + "integrity": "sha1-3UGeJo3gEqtysxnTN/IQUBP5OB8=", + "requires": { + "etag": "~1.7.0", + "fresh": "0.3.0", + "ms": "0.7.2", + "parseurl": "~1.3.1" + }, + "dependencies": { + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=" + } + } + }, "serve-index": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz", @@ -11965,6 +13891,16 @@ } } }, + "serve-static": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", + "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=", + "requires": { + "escape-html": "~1.0.3", + "parseurl": "~1.3.1", + "send": "0.13.2" + } + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -12081,6 +14017,11 @@ "object-inspect": "^1.9.0" } }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, "signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -12272,12 +14213,41 @@ "hoek": "2.x.x" } }, + "socket.io": { + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", + "integrity": "sha1-O6sEROSbVfu8FXQk29Qao3WlGnY=", + "requires": { + "base64id": "0.1.0", + "policyfile": "0.0.4", + "redis": "0.7.3", + "socket.io-client": "0.9.16" + } + }, "socket.io-adapter": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", "dev": true }, + "socket.io-client": { + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz", + "integrity": "sha1-TadRXF53MEHRtCOXBBW8xDDzX8Y=", + "requires": { + "active-x-obfuscator": "0.0.1", + "uglify-js": "1.2.5", + "ws": "0.4.x", + "xmlhttprequest": "1.4.2" + }, + "dependencies": { + "uglify-js": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", + "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY=" + } + } + }, "socket.io-parser": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz", @@ -12440,6 +14410,11 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, + "sparkles": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", + "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" + }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -12680,6 +14655,19 @@ } } }, + "stream-consume": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", + "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" + }, + "stream-counter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", + "integrity": "sha1-3tJmVWMZyLDiIoErnPOyb6fZR94=", + "requires": { + "readable-stream": "~1.1.8" + } + }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", @@ -12836,9 +14824,7 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true, - "optional": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "stringstream": { "version": "0.0.6", @@ -12847,6 +14833,23 @@ "dev": true, "optional": true }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "requires": { + "ansi-regex": "^0.2.1" + } + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "requires": { + "first-chunk-stream": "^1.0.0", + "is-utf8": "^0.2.0" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -13392,12 +15395,17 @@ }, "dependencies": { "@types/node": { - "version": "14.17.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz", - "integrity": "sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ==" + "version": "14.17.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.28.tgz", + "integrity": "sha512-1Nh2wEWN8y9hyC4yTDPccUnRunqNeBEFmmTU+K5FpGZOEixqAzMhUXzrBwajNYCZq5uoGaztaMN9Yy1PDMMB6Q==" } } }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + }, "svgo": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", @@ -13504,6 +15512,44 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "thunkify": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", @@ -13516,6 +15562,19 @@ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "requires": { + "os-homedir": "^1.0.0" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" + }, "timers-browserify": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", @@ -13531,6 +15590,11 @@ "dev": true, "optional": true }, + "tinycolor": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", + "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=" + }, "title-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz", @@ -13752,9 +15816,7 @@ "tsscmp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", - "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=", - "dev": true, - "optional": true + "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=" }, "tsutils": { "version": "3.21.0", @@ -13847,9 +15909,30 @@ } }, "ua-parser-js": { - "version": "0.7.28", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", - "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==" + "version": "0.7.30", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz", + "integrity": "sha512-uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg==" + }, + "uglify-js": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz", + "integrity": "sha1-MXZqTYIrq/XzLBQJYlHtklkpitM=", + "requires": { + "async": "~0.2.6", + "optimist": "~0.3.5", + "source-map": "~0.1.7", + "uglify-to-browserify": "~1.0.0" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } }, "uglify-to-browserify": { "version": "1.0.2", @@ -13878,6 +15961,14 @@ } } }, + "uid-safe": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz", + "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=", + "requires": { + "random-bytes": "~1.0.0" + } + }, "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", @@ -13895,6 +15986,11 @@ "which-boxed-primitive": "^1.0.2" } }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + }, "uncontrollable": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz", @@ -13934,6 +16030,11 @@ "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, + "unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" + }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -14051,6 +16152,31 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, + "useragent": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", + "requires": { + "lru-cache": "4.1.x", + "tmp": "0.0.x" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + } + } + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -14071,6 +16197,24 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "utile": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", + "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", + "requires": { + "async": "~0.2.9", + "deep-equal": "*", + "i": "0.3.x", + "mkdirp": "0.x.x", + "ncp": "0.4.x", + "rimraf": "2.x.x" + } + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" + }, "uuid": { "version": "8.3.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", @@ -14088,6 +16232,14 @@ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "requires": { + "user-home": "^1.1.1" + } + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -14124,6 +16276,72 @@ } } }, + "vhost": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", + "integrity": "sha1-L7HezUxGaqiLD5NBrzPcGv8keNU=" + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "requires": { + "clone": "^1.0.0", + "clone-stats": "^0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "requires": { + "defaults": "^1.0.0", + "glob-stream": "^3.1.5", + "glob-watcher": "^0.0.6", + "graceful-fs": "^3.0.0", + "mkdirp": "^0.5.0", + "strip-bom": "^1.0.0", + "through2": "^0.6.1", + "vinyl": "^0.4.0" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "^0.2.0", + "clone-stats": "^0.0.1" + } + } + } + }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -14315,15 +16533,6 @@ "upath": "^1.1.1" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -14718,15 +16927,6 @@ "ms": "^2.1.1" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true, - "requires": { - "bindings": "^1.5.0" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -14888,46 +17088,41 @@ "is-symbol": "^1.0.3" } }, + "which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "requires": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + } + }, "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, + "which-typed-array": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz", + "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==", + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-abstract": "^1.18.5", + "foreach": "^2.0.5", + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.7" + } + }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "window-size": { @@ -14950,8 +17145,7 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" }, "wrap-ansi": { "version": "2.1.0", @@ -15008,11 +17202,27 @@ "mkdirp": "^0.5.1" } }, + "ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", + "requires": { + "commander": "~2.1.0", + "nan": "~1.0.0", + "options": ">=0.0.5", + "tinycolor": "0.x" + } + }, "xml-char-classes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=" }, + "xmlhttprequest": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz", + "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA=" + }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", @@ -15080,6 +17290,11 @@ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true + }, + "zeparser": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz", + "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI=" } } } diff --git a/package.json b/package.json index c027ce2121..99d7a618d7 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,8 @@ "angular": "1.6.9", "angular-contenteditable": "0.3.9", "angular-dynamic-locale": "0.1.32", + "angular-embed": "github:superdesk/angular-embed#d75968e", + "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index ca6d2d8921..ef1f0eb12b 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -85,6 +85,7 @@ angular.module('superdesk.apps.authoring', [ 'contenteditable', 'decipher.history', 'superdesk.config', + 'angular-embed', mediaModule.name, ]) @@ -421,7 +422,15 @@ angular.module('superdesk.apps.authoring', [ }, }); }]) - .run(['keyboardManager', 'gettext', function(keyboardManager) { + .config(['embedServiceProvider', 'iframelyServiceProvider', + function(embedServiceProvider, iframelyServiceProvider) { + iframelyServiceProvider.setKey(appConfig.iframely.key); + // don't use noembed as first choice + embedServiceProvider.setConfig('useOnlyFallback', true); + // iframely respect the original embed for more services than 'embedly' + embedServiceProvider.setConfig('fallbackService', 'iframely'); + }]) + .run(['keyboardManager', 'embedService', function(keyboardManager) { keyboardManager.register('Authoring', 'ctrl + shift + u', gettext('Unlock current item')); keyboardManager.register('Authoring', 'ctrl + shift + e', gettext('Close current item')); keyboardManager.register('Authoring', 'ctrl + shift + s', gettext('Save current item')); diff --git a/scripts/apps/authoring/macros/macros.spec.ts b/scripts/apps/authoring/macros/macros.spec.ts index d142df5754..eee7e8136f 100644 --- a/scripts/apps/authoring/macros/macros.spec.ts +++ b/scripts/apps/authoring/macros/macros.spec.ts @@ -25,6 +25,7 @@ describe('macros', () => { }, ]; + beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index feb1c28818..66f0c73ed9 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -13,6 +13,7 @@ describe('authoring', () => { $provide.constant('lodash', _); })); + beforeEach(window.module('angular-embed')); beforeEach(window.module('superdesk.apps.publish')); beforeEach(window.module('superdesk.core.preferences')); beforeEach(window.module('superdesk.apps.archive')); diff --git a/scripts/vendor.ts b/scripts/vendor.ts index 152b8aabe0..48a3fbfd6f 100644 --- a/scripts/vendor.ts +++ b/scripts/vendor.ts @@ -8,6 +8,8 @@ import 'angular'; import 'angular-resource'; import 'angular-route'; import 'angular-gettext'; +import 'angular-embedly'; +import 'angular-embed'; import 'angular-contenteditable'; import 'angular-vs-repeat'; import 'angular-moment'; diff --git a/webpack.config.js b/webpack.config.js index bd84a37f32..912bb0b45d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -65,6 +65,7 @@ module.exports = function makeConfig(grunt) { alias: { 'moment-timezone': 'moment-timezone/builds/moment-timezone-with-data-2012-2022', 'rangy-saverestore': 'rangy/lib/rangy-selectionsaverestore', + 'angular-embedly': 'angular-embedly/em-minified/angular-embedly.min', 'jquery-gridster': 'gridster/dist/jquery.gridster.min', 'external-apps': path.join(process.cwd(), 'dist', 'app-importer.generated.js'), }, From bc09f4d915267d658fc6295d57e14ca282685ab7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 25 Oct 2021 12:27:00 +0200 Subject: [PATCH 0089/1070] remove conditionals checking whether editor3 is enabled --- scripts/apps/authoring/macros/macros.ts | 2 +- scripts/apps/authoring/track-changes/inline-comments.ts | 9 ++++++--- scripts/apps/authoring/track-changes/suggestions.ts | 9 ++++++--- .../content/controllers/ContentProfilesController.ts | 2 -- .../content/directives/ContentProfileSchemaEditor.ts | 5 +---- .../apps/workspace/content/views/profile-settings.html | 3 --- scripts/apps/workspace/content/views/schema-editor.html | 4 ++-- scripts/core/superdesk-api.d.ts | 1 - 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/scripts/apps/authoring/macros/macros.ts b/scripts/apps/authoring/macros/macros.ts index 747f75e90d..ef859d71ed 100644 --- a/scripts/apps/authoring/macros/macros.ts +++ b/scripts/apps/authoring/macros/macros.ts @@ -165,7 +165,7 @@ function MacrosController($scope, macros, desks, autosave, $rootScope, storage, */ $scope.call = function(macro) { const editor = editorResolver.get(); - const isEditor3 = editor.version() !== '2'; + const isEditor3 = editor.version() === '3'; const useReplace = macro.replace_type != null && macro.replace_type !== 'no-replace'; const isSimpleReplace = macro.replace_type === 'simple-replace'; let item = _.extend({}, $scope.origItem, $scope.item); diff --git a/scripts/apps/authoring/track-changes/inline-comments.ts b/scripts/apps/authoring/track-changes/inline-comments.ts index 13b54cf73a..d927361f7c 100644 --- a/scripts/apps/authoring/track-changes/inline-comments.ts +++ b/scripts/apps/authoring/track-changes/inline-comments.ts @@ -155,9 +155,12 @@ angular return new Promise((resolve) => { content.getType(item.profile).then((type) => { - const editor3enabled = get(type, 'editor.body_html.editor3') === true; - - resolve(editor3enabled); + /** + * It used to be checked whether editor3 is enabled, + * but now that editor3 is the only editor + * it is only checked whether content profile has body_html field + */ + resolve(type?.editor?.body_html != null); }); }); }], diff --git a/scripts/apps/authoring/track-changes/suggestions.ts b/scripts/apps/authoring/track-changes/suggestions.ts index d20a679892..4395695810 100644 --- a/scripts/apps/authoring/track-changes/suggestions.ts +++ b/scripts/apps/authoring/track-changes/suggestions.ts @@ -109,9 +109,12 @@ angular return new Promise((resolve) => { content.getType(item.profile).then((type) => { - const editor3enabled = get(type, 'editor.body_html.editor3') === true; - - resolve(editor3enabled); + /** + * It used to be checked whether editor3 is enabled, + * but now that editor3 is the only editor + * it is only checked whether content profile has body_html field + */ + resolve(type?.editor?.body_html != null); }); }); }], diff --git a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts index eada49eb94..b4eb2100f5 100644 --- a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts +++ b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts @@ -33,8 +33,6 @@ export function ContentProfilesController($scope, $location, notify, content, mo }); }; - $scope.withEditor3 = appConfig.features != null && appConfig.features.editor3; - /** * @description Refreshes the list of content profiles by fetching them. * @returns {Promise} diff --git a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts b/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts index b5cb062ea8..943107b632 100644 --- a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts +++ b/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts @@ -194,10 +194,7 @@ export function ContentProfileSchemaEditor(vocabularies) { */ scope.hasFormatOptions = (field) => Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(field) - || ( - scope.model.editor.body_html.editor3 === true - && Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(field) - ) + || Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(field) || hasCustomFieldFormatOptions(field); /** diff --git a/scripts/apps/workspace/content/views/profile-settings.html b/scripts/apps/workspace/content/views/profile-settings.html index 8dc772b74f..4ab89f78e3 100644 --- a/scripts/apps/workspace/content/views/profile-settings.html +++ b/scripts/apps/workspace/content/views/profile-settings.html @@ -107,9 +107,6 @@

{{ :: 'Editing' | translate }} "{{ editing.form.label
-
- -
diff --git a/scripts/apps/workspace/content/views/schema-editor.html b/scripts/apps/workspace/content/views/schema-editor.html index dbfef67af7..b45498ab9a 100644 --- a/scripts/apps/workspace/content/views/schema-editor.html +++ b/scripts/apps/workspace/content/views/schema-editor.html @@ -78,9 +78,9 @@
-
+
-
Date: Mon, 25 Oct 2021 13:58:18 +0200 Subject: [PATCH 0090/1070] fix ghost list item remaining in "other fields" section after starting to create an item and cancelling without saving --- .../vocabularies/controllers/VocabularyEditController.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/apps/vocabularies/controllers/VocabularyEditController.tsx b/scripts/apps/vocabularies/controllers/VocabularyEditController.tsx index a72e9b0220..08983c81e1 100644 --- a/scripts/apps/vocabularies/controllers/VocabularyEditController.tsx +++ b/scripts/apps/vocabularies/controllers/VocabularyEditController.tsx @@ -188,8 +188,13 @@ export function VocabularyEditController( * Discard changes and close modal. */ $scope.cancel = function() { + const editing = origVocabulary?._id != null; + + if (editing) { + $scope.updateVocabulary(origVocabulary); + } + $scope.closeVocabulary(); - $scope.updateVocabulary(origVocabulary); }; // try to reproduce data model of vocabulary: From c412d6eb4246e51a560ecb56a294ea367075b793 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 25 Oct 2021 18:55:02 +0200 Subject: [PATCH 0091/1070] custom fields extension --- .../extensions/customFieldTypes/.gitignore | 1 + .../customFieldTypes/package-lock.json | 1347 +++++++++++++++++ .../extensions/customFieldTypes/package.json | 13 + .../customFieldTypes/src/extension.ts | 16 + .../customFieldTypes/src/superdesk.ts | 4 + .../customFieldTypes/src/tsconfig.json | 6 + .../customFieldTypes/src/typings/refs.d.ts | 1 + 7 files changed, 1388 insertions(+) create mode 100644 scripts/extensions/customFieldTypes/.gitignore create mode 100644 scripts/extensions/customFieldTypes/package-lock.json create mode 100644 scripts/extensions/customFieldTypes/package.json create mode 100644 scripts/extensions/customFieldTypes/src/extension.ts create mode 100644 scripts/extensions/customFieldTypes/src/superdesk.ts create mode 100644 scripts/extensions/customFieldTypes/src/tsconfig.json create mode 100644 scripts/extensions/customFieldTypes/src/typings/refs.d.ts diff --git a/scripts/extensions/customFieldTypes/.gitignore b/scripts/extensions/customFieldTypes/.gitignore new file mode 100644 index 0000000000..53c37a1660 --- /dev/null +++ b/scripts/extensions/customFieldTypes/.gitignore @@ -0,0 +1 @@ +dist \ No newline at end of file diff --git a/scripts/extensions/customFieldTypes/package-lock.json b/scripts/extensions/customFieldTypes/package-lock.json new file mode 100644 index 0000000000..3e07526103 --- /dev/null +++ b/scripts/extensions/customFieldTypes/package-lock.json @@ -0,0 +1,1347 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "acorn": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "dev": true + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "^3.0.4" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "ajv-keywords": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "dev": true + }, + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-includes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + } + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + }, + "dependencies": { + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "^0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "chardet": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", + "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "es-abstract": { + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", + "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "eslint": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", + "dev": true, + "requires": { + "ajv": "^5.3.0", + "babel-code-frame": "^6.22.0", + "chalk": "^2.1.0", + "concat-stream": "^1.6.0", + "cross-spawn": "^5.1.0", + "debug": "^3.1.0", + "doctrine": "^2.1.0", + "eslint-scope": "^3.7.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^3.5.4", + "esquery": "^1.0.0", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.0.1", + "ignore": "^3.3.3", + "imurmurhash": "^0.1.4", + "inquirer": "^3.0.6", + "is-resolvable": "^1.0.0", + "js-yaml": "^3.9.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.4", + "minimatch": "^3.0.2", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "pluralize": "^7.0.0", + "progress": "^2.0.0", + "regexpp": "^1.0.1", + "require-uncached": "^1.0.3", + "semver": "^5.3.0", + "strip-ansi": "^4.0.0", + "strip-json-comments": "~2.0.1", + "table": "4.0.2", + "text-table": "~0.2.0" + } + }, + "eslint-plugin-angular": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-angular/-/eslint-plugin-angular-3.3.0.tgz", + "integrity": "sha512-43HsDbJS0hx9xPU4Ox/pkz90ie4DuRao9ovcz4vteO6OOxVdH5lsOlGTmlJbrEiVyphF1sUwRDPuglu21Gg/GQ==", + "dev": true + }, + "eslint-plugin-jasmine": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz", + "integrity": "sha1-VzO3CedR9LxA4x4cFpib0s377Jc=", + "dev": true + }, + "eslint-plugin-react": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz", + "integrity": "sha512-p+PGoGeV4SaZRDsXqdj9OWcOrOpZn8gXoGPcIQTzo2IDMbAKhNDnME9myZWqO3Ic4R3YmwAZ1lDjWl2R2hMUVQ==", + "dev": true, + "requires": { + "array-includes": "^3.1.1", + "doctrine": "^2.1.0", + "has": "^1.0.3", + "jsx-ast-utils": "^2.2.3", + "object.entries": "^1.1.1", + "object.fromentries": "^2.0.2", + "object.values": "^1.1.1", + "prop-types": "^15.7.2", + "resolve": "^1.14.2" + } + }, + "eslint-scope": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", + "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, + "espree": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "dev": true, + "requires": { + "acorn": "^5.5.0", + "acorn-jsx": "^3.0.0" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "esquery": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", + "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "dev": true, + "requires": { + "estraverse": "^4.0.0" + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, + "external-editor": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", + "dev": true, + "requires": { + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true, + "requires": { + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" + } + }, + "flat-cache": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", + "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", + "dev": true, + "requires": { + "circular-json": "^0.3.1", + "graceful-fs": "^4.1.2", + "rimraf": "~2.6.2", + "write": "^0.2.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "inquirer": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "dev": true, + "requires": { + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.0.4", + "figures": "^2.0.0", + "lodash": "^4.3.0", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rx-lite": "^4.0.8", + "rx-lite-aggregates": "^4.0.8", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" + } + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true + }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "jsx-ast-utils": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz", + "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==", + "dev": true, + "requires": { + "array-includes": "^3.0.3", + "object.assign": "^4.1.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "object.entries": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", + "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.fromentries": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz", + "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "dev": true + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "react-is": { + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", + "dev": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "regexpp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", + "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", + "dev": true + }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, + "requires": { + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" + } + }, + "resolve": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz", + "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } + }, + "rx-lite": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", + "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", + "dev": true + }, + "rx-lite-aggregates": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", + "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "dev": true, + "requires": { + "rx-lite": "*" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "slice-ansi": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", + "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + } + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "superdesk-code-style": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/superdesk-code-style/-/superdesk-code-style-1.3.0.tgz", + "integrity": "sha512-5kfNJXOpjt8JNpuc6azl0m0E4H1GrPr/wsunkjT6xvOb5n/3UEvNsg0vqSPdepKsud+0X11nNEOMDYa876vEeA==", + "dev": true, + "requires": { + "eslint": "^4.11.0", + "eslint-plugin-angular": "^3.1.1", + "eslint-plugin-jasmine": "^2.9.1", + "eslint-plugin-react": "^7.5.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "table": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", + "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "dev": true, + "requires": { + "ajv": "^5.2.3", + "ajv-keywords": "^2.1.0", + "chalk": "^2.1.0", + "lodash": "^4.17.4", + "slice-ansi": "1.0.0", + "string-width": "^2.1.1" + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, + "typescript": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + } + } +} diff --git a/scripts/extensions/customFieldTypes/package.json b/scripts/extensions/customFieldTypes/package.json new file mode 100644 index 0000000000..6ebdd94f58 --- /dev/null +++ b/scripts/extensions/customFieldTypes/package.json @@ -0,0 +1,13 @@ +{ + "private": true, + "main": "dist/src/extension.js", + "scripts": { + "compile": "tsc -p src", + "compile-e2e": "echo 'No end-to-end tests defined'", + "watch": "tsc -watch -p src" + }, + "devDependencies": { + "superdesk-code-style": "1.3.0", + "typescript": "4.0.3" + } +} diff --git a/scripts/extensions/customFieldTypes/src/extension.ts b/scripts/extensions/customFieldTypes/src/extension.ts new file mode 100644 index 0000000000..23aa89a8b5 --- /dev/null +++ b/scripts/extensions/customFieldTypes/src/extension.ts @@ -0,0 +1,16 @@ +import {IExtension, IExtensionActivationResult} from 'superdesk-api'; +// import {superdesk} from './superdesk'; + +const result: IExtensionActivationResult = { + contributions: { + customFieldTypes: [], + }, +}; + +const extension: IExtension = { + activate: () => { + return Promise.resolve(result); + }, +}; + +export default extension; diff --git a/scripts/extensions/customFieldTypes/src/superdesk.ts b/scripts/extensions/customFieldTypes/src/superdesk.ts new file mode 100644 index 0000000000..7277e3cc83 --- /dev/null +++ b/scripts/extensions/customFieldTypes/src/superdesk.ts @@ -0,0 +1,4 @@ +import {ISuperdesk} from 'superdesk-api'; + +// @ts-ignore +export const superdesk = window['extensionsApiInstances']['customFieldTypes'] as ISuperdesk; diff --git a/scripts/extensions/customFieldTypes/src/tsconfig.json b/scripts/extensions/customFieldTypes/src/tsconfig.json new file mode 100644 index 0000000000..ec09828842 --- /dev/null +++ b/scripts/extensions/customFieldTypes/src/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "superdesk-code-style/tsconfig-strict", + "compilerOptions": { + "outDir": "../dist/src" + } +} diff --git a/scripts/extensions/customFieldTypes/src/typings/refs.d.ts b/scripts/extensions/customFieldTypes/src/typings/refs.d.ts new file mode 100644 index 0000000000..639f614dd2 --- /dev/null +++ b/scripts/extensions/customFieldTypes/src/typings/refs.d.ts @@ -0,0 +1 @@ +/// From 0ef101d10712e1be73464195240d4eea4aaa020a Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 10:19:01 +0200 Subject: [PATCH 0092/1070] WIP --- scripts/appConfig.ts | 2 +- .../apps/authoring-react/authoring-react.tsx | 58 ++++++++++------- .../authoring-react/authoring-section.tsx | 63 +++++++++++++++++++ scripts/apps/authoring-react/data-layer.ts | 23 ++++--- .../authoring-react/fields/field-text.tsx | 23 +++++++ .../customFieldTypes/src/extension.ts | 16 ++++- 6 files changed, 152 insertions(+), 33 deletions(-) create mode 100644 scripts/apps/authoring-react/authoring-section.tsx create mode 100644 scripts/apps/authoring-react/fields/field-text.tsx diff --git a/scripts/appConfig.ts b/scripts/appConfig.ts index 53cd42afc7..32f57965bb 100644 --- a/scripts/appConfig.ts +++ b/scripts/appConfig.ts @@ -37,6 +37,6 @@ export const debugInfo = { translationsLoaded: false, }; -export const authoringReactViewEnabled = false; +export const authoringReactViewEnabled = true; export const extensions: IExtensions = {}; diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index 2411599a4c..e9f62a16dd 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -4,6 +4,7 @@ import {Button} from 'superdesk-ui-framework'; import {gettext} from 'core/utils'; import {dataApi} from 'core/helpers/CrudManager'; import {getContentProfile, IContentProfileV2} from './data-layer'; +import {AuthoringSection} from './authoring-section'; interface IProps { itemId: IArticle['_id']; @@ -12,7 +13,8 @@ interface IProps { interface IStateLoaded { loading: false; - item: IArticle; + itemOriginal: IArticle; + itemWithChanges: IArticle; profile: IContentProfileV2; } @@ -50,10 +52,7 @@ export class AuthoringReact extends React.PureComponent { [ fetchArticle(this.props.itemId).then((item) => { return getContentProfile(item).then((profile) => { - return { - item, - profile, - }; + return {item, profile}; }); }), waitForCssAnimation(), @@ -61,7 +60,14 @@ export class AuthoringReact extends React.PureComponent { ).then((res) => { const [{item, profile}] = res; - this.setState({loading: false, item, profile}); + const nextState: IStateLoaded = { + loading: false, + itemOriginal: Object.freeze(item), + itemWithChanges: item, + profile: profile, + }; + + this.setState(nextState); }); } @@ -91,27 +97,35 @@ export class AuthoringReact extends React.PureComponent {

{gettext('Header')}

- { - state.profile.header.map((field) => ( -
- -
{state.item[field.name]}
-
- )).toArray() - } + { + const nextState: IStateLoaded = { + ...state, + itemWithChanges: itemChanged, + }; + + this.setState(nextState); + }} + />

{gettext('Content')}

- { - state.profile.content.map((field) => ( -
- -
{state.item[field.name]}
-
- )).toArray() - } + { + const nextState: IStateLoaded = { + ...state, + itemWithChanges: itemChanged, + }; + + this.setState(nextState); + }} + />
diff --git a/scripts/apps/authoring-react/authoring-section.tsx b/scripts/apps/authoring-react/authoring-section.tsx new file mode 100644 index 0000000000..a6bb3b3fb6 --- /dev/null +++ b/scripts/apps/authoring-react/authoring-section.tsx @@ -0,0 +1,63 @@ +import React from 'react'; +import {IFieldsV2} from './data-layer'; +import {IArticle} from 'superdesk-api'; +import {FieldText} from './fields/field-text'; +import {assertNever} from 'core/helpers/typescript-helpers'; + +interface IProps { + fields: IFieldsV2; + item: IArticle; + onChange(itemChanged: IArticle): void; +} + +export class AuthoringSection extends React.PureComponent { + render() { + const {item, fields} = this.props; + + return ( +
+ { + fields.map((field) => ( +
+

{field.id}

+ + {(() => { + const {type} = field; + + switch (type) { + case 'text': + return ( + { + this.props.onChange({ + ...item, + [field.id]: valueChanged, + }); + }} + /> + ); + + case 'dropdown': + return ( + { + this.props.onChange({ + ...item, + [field.id]: valueChanged, + }); + }} + /> + ); + default: + return assertNever(type); + } + })()} +
+ )).toArray() + } +
+ ); + } +} diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts index 259e9a5589..85880a3ff2 100644 --- a/scripts/apps/authoring-react/data-layer.ts +++ b/scripts/apps/authoring-react/data-layer.ts @@ -2,11 +2,20 @@ import {OrderedMap} from 'immutable'; import {IArticle} from 'superdesk-api'; import ng from 'core/services/ng'; -export interface IAuthoringFieldV2 { - name: string; - type: 'plain-text' | 'html' | 'dropdown'; +interface IFieldBase { + id: string; +} + +interface IFieldText extends IFieldBase { + type: 'text'; } +interface IFieldDropdown extends IFieldBase { + type: 'dropdown'; +} + +export type IAuthoringFieldV2 = IFieldText | IFieldDropdown; + export type IFieldsV2 = OrderedMap; export interface IContentProfileV2 { @@ -40,14 +49,14 @@ export function getContentProfile(item: IArticle): Promise { for (const editorItem of editorOrdered) { const field: IAuthoringFieldV2 = { - name: editorItem.name, - type: 'plain-text', + id: editorItem.name ?? 'hmtl', + type: 'text', }; if (editorItem.section === 'header') { - headerFields = headerFields.set(field.name, field); + headerFields = headerFields.set(field.id, field); } else if (editorItem.section === 'content') { - contentFields = contentFields.set(field.name, field); + contentFields = contentFields.set(field.id, field); } else { throw new Error('invalid section'); } diff --git a/scripts/apps/authoring-react/fields/field-text.tsx b/scripts/apps/authoring-react/fields/field-text.tsx new file mode 100644 index 0000000000..fda1653abc --- /dev/null +++ b/scripts/apps/authoring-react/fields/field-text.tsx @@ -0,0 +1,23 @@ +import React from 'react'; +import {IArticle} from 'superdesk-api'; + +interface IProps { + value: string; + onChange(value: string): void; +} + +export class FieldText extends React.PureComponent { + render() { + return ( +
+ { + this.props.onChange(event.target.value); + }} + /> +
+ ); + } +} diff --git a/scripts/extensions/customFieldTypes/src/extension.ts b/scripts/extensions/customFieldTypes/src/extension.ts index 23aa89a8b5..38cde2ada0 100644 --- a/scripts/extensions/customFieldTypes/src/extension.ts +++ b/scripts/extensions/customFieldTypes/src/extension.ts @@ -1,9 +1,19 @@ -import {IExtension, IExtensionActivationResult} from 'superdesk-api'; -// import {superdesk} from './superdesk'; +import {IExtension, IExtensionActivationResult, ICustomFieldType} from 'superdesk-api'; +import {superdesk} from './superdesk'; + +const {gettext} = superdesk.localization; + +const field: ICustomFieldType<{}> = { + id: '', +}; const result: IExtensionActivationResult = { contributions: { - customFieldTypes: [], + customFieldTypes: [ + { + id: '', + }, + ], }, }; From 5519836d39cdef6e3b0e7107b4e2ee399ba1b943 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 12:39:06 +0200 Subject: [PATCH 0093/1070] fix e2e test "can manage templates" --- e2e/client/specs/helpers/authoring.ts | 9 ++++++--- scripts/apps/templates/directives/TemplatesDirective.ts | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 178c483d6d..857ca4d726 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -230,7 +230,7 @@ class Authoring { this.publish_panel = element(by.css('#panel-publish:not(.ng-hide)')); this.send_panel = element(by.css('#panel-send:not(.ng-hide)')); this.fetch_panel = element(by.css('#panel-fetch:not(.ng-hide)')); - this.headline = element(by.model('item.headline')).all(by.className('editor-type-html')).first(); + this.headline = element(by.css('.headline [contenteditable]')); this.send_kill_button = element(by.id('send-kill-btn')); this.send_correction_button = element(by.id('send-correction-btn')); @@ -733,8 +733,11 @@ class Authoring { return element(by.id('subnav')); }; - var getBodyHtml = () => browser.wait(ECE.presenceOf(element(by.model('item.body_html')))) - .then(() => element(by.model('item.body_html')).all(by.className('editor-type-html')).first()); + var getBodyHtml = () => { + const elem = element(by.css('.field.body [contenteditable]')); + + return browser.wait(ECE.presenceOf(elem)).then(() => elem); + }; var abstract = element(by.model('item.abstract')).all(by.className('editor-type-html')).first(); var bodyFooter = element(by.id('body_footer')).all(by.className('editor-type-html')).first(); diff --git a/scripts/apps/templates/directives/TemplatesDirective.ts b/scripts/apps/templates/directives/TemplatesDirective.ts index 4a7dee0ff6..f28e75f0c6 100644 --- a/scripts/apps/templates/directives/TemplatesDirective.ts +++ b/scripts/apps/templates/directives/TemplatesDirective.ts @@ -272,6 +272,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday $scope.template = _.create($scope.origTemplate); $scope.template.schedule = $scope.origTemplate.schedule || {}; $scope.template.data = $scope.origTemplate.data || { + type: 'text', headline: '', abstract: '', byline: '', From 049de5b0897e5e26d62ac6c031a52d170c8252d8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 13:15:28 +0200 Subject: [PATCH 0094/1070] fixed e2e - "can search by search field" & "can action on items" --- e2e/client/specs/authoring_spec.ts | 25 ------------------------- e2e/client/specs/helpers/authoring.ts | 4 ++-- e2e/client/specs/search_spec.ts | 13 ------------- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 405a209474..065be3bcd9 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -405,31 +405,6 @@ describe('authoring', () => { expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy(); }); - it('spellcheck hilite sentence word for capitalization and ignore the word after abbreviations', () => { - nav('/settings/dictionaries'); - dictionaries.edit('Test 1'); - expect(dictionaries.getWordsCount()).toBe(0); - dictionaries.search('abbrev.'); - dictionaries.saveWord(); - dictionaries.search('abbrev'); - dictionaries.saveWord(); - expect(dictionaries.getWordsCount()).toBe(2); - dictionaries.save(); - browser.sleep(200); - - monitoring.openMonitoring(); - - authoring.createTextItem(); - authoring.writeText('some is a sentence word, but words come after an abbrev. few are not'); - browser.sleep(200); - expect(authoring.getBodyInnerHtml()).toContain('some'); - expect(authoring.getBodyInnerHtml()).not.toContain('few'); - expect(authoring.getBodyInnerHtml()).toContain('few'); - }); - it('related item widget', () => { monitoring.actionOnItem('Edit', 2, 1); authoring.writeText('something'); diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 857ca4d726..28f1557fe3 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -739,8 +739,8 @@ class Authoring { return browser.wait(ECE.presenceOf(elem)).then(() => elem); }; - var abstract = element(by.model('item.abstract')).all(by.className('editor-type-html')).first(); - var bodyFooter = element(by.id('body_footer')).all(by.className('editor-type-html')).first(); + var abstract = element(by.css('.abstract [contenteditable]')); + var bodyFooter = element(by.css('#body_footer [contenteditable]')); var packageSlugline = element.all(by.className('keyword')).last(); var byline = element(by.model('item.byline')).all(by.className('editor-type-html')).first(); diff --git a/e2e/client/specs/search_spec.ts b/e2e/client/specs/search_spec.ts index 1b87708dd5..4311f0ec5a 100644 --- a/e2e/client/specs/search_spec.ts +++ b/e2e/client/specs/search_spec.ts @@ -231,19 +231,6 @@ describe('search', () => { browser.actions().sendKeys(protractor.Key.UP).perform(); expect(previewPane.isPresent()).toBe(false); // UP arrow key avoided for opening preview // it should not effect global keyboard shortcuts (e.g: 'ctrl+alt+d', 'ctrl+shift+*') - // now test 'ctrl+shift+*' shortcut that triggers spell checker when not set to automatic - expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeTruthy(); - authoring.toggleAutoSpellCheck(); - expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy(); - authoring.focusBodyHtmlElement(); - browser.actions().sendKeys(protractor.Key.ENTER).perform(); - browser.actions().sendKeys('Testhilite').perform(); - expect(authoring.getBodyText()).toContain('Testhilite'); - expect(authoring.getBodyInnerHtml()).not.toContain('sderror sdhilite'); - // trigger spell checker via keyboard operation - browser.actions().sendKeys(protractor.Key.chord(protractor.Key.CONTROL, protractor.Key.SHIFT, 'y')).perform(); - expect(authoring.getBodyText()).toContain('Testhilite'); - expect(authoring.getBodyInnerHtml()).toContain('sderror sdhilite'); authoring.save(); authoring.close(); // now test 'ctrl+0' shortcut that triggers story search dialog box From d9bf2ef7b67846d8429d0bcf9841dd1817a87bd7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 14:07:59 +0200 Subject: [PATCH 0095/1070] e2e fix - "can view published item as readonly when opened" --- e2e/client/specs/monitoring_spec.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 90f77a4ede..450c97e7ea 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -866,11 +866,10 @@ describe('monitoring', () => { monitoring.actionOnItem('Open', 4, 0); expect(authoring.save_button.isPresent()).toBe(false); // Save button hidden for publish item - var textField = element(by.className('text-editor')); - // expect contenteditable=true attribute is missing/null for text-editor field, - // hence editing is disabled for published item + const bodyHtml = element(by.css('.field.body [contenteditable]')); - expect(textField.getAttribute('contenteditable')).toBe(null); + expect(bodyHtml.isPresent()).toBe(true); + expect(bodyHtml.getAttribute('contenteditable')).toBe('false'); }); it('closes preview when an item is opened for editing', () => { From f1c1e84e2a8e4efbce52f9902affe137166b02af Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 14:22:21 +0200 Subject: [PATCH 0096/1070] e2e fix - "creates corresponding template" --- e2e/client/specs/helpers/authoring.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 28f1557fe3..543bd1c0d6 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -847,7 +847,7 @@ class Authoring { }; this.getAbstractFieldCount = function() { - return element.all(by.model('item.abstract')).count(); + return element.all(by.css('.abstract [contenteditable]')).count(); }; this.closeHeader = function() { From 426e67f2ab6ff8c97fc83d438c2be524976e1173 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 26 Oct 2021 14:38:17 +0200 Subject: [PATCH 0097/1070] drop global history --- e2e/client/specs/authoring_spec.ts | 16 ------- .../directives/ArticleEditDirective.ts | 4 -- scripts/apps/authoring/authoring/index.ts | 2 - .../authoring/services/HistoryFactory.ts | 48 ------------------- .../authoring/authoring/services/index.ts | 1 - 5 files changed, 71 deletions(-) delete mode 100644 scripts/apps/authoring/authoring/services/HistoryFactory.ts diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 065be3bcd9..b12a209514 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -636,22 +636,6 @@ describe('authoring', () => { expect(authoring.send_kill_button.isDisplayed()).toBeTruthy(); }); - it('after undo/redo save last version', () => { - monitoring.actionOnItem('Edit', 2, 0); - authoring.cleanBodyHtmlElement(); - browser.sleep(2000); - authoring.writeText('one\ntwo\nthree'); - browser.sleep(2000); // wait for autosave - authoring.backspaceBodyHtml(5); - browser.sleep(2000); - ctrlKey('z'); - browser.sleep(1000); - authoring.save(); - authoring.close(); - monitoring.actionOnItem('Edit', 2, 0); - expect(authoring.getBodyText()).toBe('one\ntwo\nthree'); - }); - it('can minimize story while a correction and kill is being written', () => { workspace.selectDesk('Politic Desk'); expect(monitoring.getTextItem(3, 2)).toBe('item6'); diff --git a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts index ce49964fe8..c061a5c670 100644 --- a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts +++ b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts @@ -85,8 +85,6 @@ ArticleEditDirective.$inject = [ '$filter', 'superdesk', 'session', - 'history', - '$interpolate', 'suggest', 'renditions', ]; @@ -96,8 +94,6 @@ export function ArticleEditDirective( $filter, superdesk, session, - history, - $interpolate, suggest, renditions, ) { diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index ef1f0eb12b..b8ad7f1adf 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -96,8 +96,6 @@ angular.module('superdesk.apps.authoring', [ .service('authoringWorkspace', svc.AuthoringWorkspaceService) .service('renditions', svc.RenditionsService) - .factory('history', svc.HistoryFactory) - .directive('html5vfix', directive.Html5vfix) .directive('sdDashboardCard', directive.DashboardCard) .directive('sdSendItem', directive.SendItem) diff --git a/scripts/apps/authoring/authoring/services/HistoryFactory.ts b/scripts/apps/authoring/authoring/services/HistoryFactory.ts deleted file mode 100644 index 7a96a8450b..0000000000 --- a/scripts/apps/authoring/authoring/services/HistoryFactory.ts +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Watches an expression to keep history of its states - * and binds ctrl-z and ctrl-y to undo/redo its states - */ -HistoryFactory.$inject = ['History', '$window', '$timeout']; -export function HistoryFactory(History, $window, $timeout) { - var KeyOperations = { - ['Z'.charCodeAt(0)]: History.undo, - ['Y'.charCodeAt(0)]: History.redo, - }; - - return { - watch: function(expression, scope) { - $timeout(() => { - History.watch(expression, scope); - }, 0, false); - var onHistoryKey = function(event, cb) { - var modifier = (event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey; - - if (modifier && KeyOperations[event.keyCode]) { - cb(); - } - }; - var onHistoryKeydown = function(event) { - onHistoryKey(event, () => { - // action is on keydown because command key (event.metakey) on OSX is not detected on keyup events - // for some reason. - scope.$apply(() => { - KeyOperations[event.keyCode].bind(History)(expression, scope); - }); - }); - }; - var onHistoryKeyup = function(event) { - onHistoryKey(event, () => { - event.preventDefault(); - }); - }; - - angular.element($window).on('keydown', onHistoryKeydown); - angular.element($window).on('keyup', onHistoryKeyup); - scope.$on('$destroy', () => { - angular.element($window).unbind('keydown', onHistoryKeydown); - angular.element($window).unbind('keyup', onHistoryKeyup); - History.forget(scope, expression); - }); - }, - }; -} diff --git a/scripts/apps/authoring/authoring/services/index.ts b/scripts/apps/authoring/authoring/services/index.ts index 2faac306ca..52e28f1764 100644 --- a/scripts/apps/authoring/authoring/services/index.ts +++ b/scripts/apps/authoring/authoring/services/index.ts @@ -5,4 +5,3 @@ export {LockService} from './LockService'; export {AuthoringThemesService} from './AuthoringThemesService'; export {AuthoringWorkspaceService} from './AuthoringWorkspaceService'; export {RenditionsService} from './RenditionsService'; -export {HistoryFactory} from './HistoryFactory'; From 56549ac3a8bc73bc84b9133f2e45b53e8aff2396 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 13:28:06 +0200 Subject: [PATCH 0098/1070] fix clearOverflowInlineStyles breaking undo insertOverflowInlineStyles still breaks undo. Not sure if it can be fixed easily. I suspect draftjs uses inline styles internally as a undo/redo boundary. We should use decorators to highlight overflowing chars. The problem with that is, that by default, draftjs doesn't allow multiple decorators for the same range. We already have spellchecker as a decorator. I've seen suggestions in github comments that it might be possible to build a composite decorator component without touching draftjs internals --- .../core/editor3/helpers/characters-limit.ts | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/scripts/core/editor3/helpers/characters-limit.ts b/scripts/core/editor3/helpers/characters-limit.ts index 5caa8a8721..558edc28f1 100644 --- a/scripts/core/editor3/helpers/characters-limit.ts +++ b/scripts/core/editor3/helpers/characters-limit.ts @@ -2,8 +2,6 @@ import { EditorState, Modifier, SelectionState, - DraftEditorCommand, - RichUtils, } from 'draft-js'; import {getEditorFieldCharactersCount} from 'apps/authoring/authoring/components/CharacterCount'; import getFragmentFromSelection from 'draft-js/lib/getFragmentFromSelection'; @@ -39,6 +37,7 @@ function getLengthOfSelectedText(editorState: EditorState) { } function clearOverflowInlineStyles(editorState: EditorState) { + const restoreSelection = editorState.getSelection(); const blockMap = editorState.getCurrentContent().getBlockMap(); // clear inline style from all text @@ -53,12 +52,21 @@ function clearOverflowInlineStyles(editorState: EditorState) { LIMIT_CHARACTERS_OVERFLOW_STYLE, ); - let newEditorState = EditorState.push( - editorState, + let newEditorState = EditorState.set(editorState, {allowUndo: false}); + + newEditorState = EditorState.push( + newEditorState, newContentState, 'change-inline-style', ); + newEditorState = EditorState.forceSelection( + newEditorState, + restoreSelection, + ); + + newEditorState = EditorState.set(editorState, {allowUndo: true}); + return newEditorState; } @@ -66,6 +74,8 @@ function insertOverflowInlineStyles( editorState: EditorState, overflow: number, ) { + const restoreSelection = editorState.getSelection(); + const blocks = editorState .getCurrentContent() .getBlocksAsArray() @@ -111,12 +121,21 @@ function insertOverflowInlineStyles( LIMIT_CHARACTERS_OVERFLOW_STYLE, ); - let newEditorState = EditorState.push( - editorState, + let newEditorState = EditorState.set(editorState, {allowUndo: false}); + + newEditorState = EditorState.push( + newEditorState, newContentState, 'change-inline-style', ); + newEditorState = EditorState.forceSelection( + newEditorState, + restoreSelection, + ); + + newEditorState = EditorState.set(newEditorState, {allowUndo: true}); + return newEditorState; } @@ -130,21 +149,14 @@ export function handleOverflowHighlights( return editorState; } - const restoreSelection = editorState.getSelection(); + let newEditorState = editorState; const overflow = length - limit; const reachedLimit = overflow > 0; - let newEditorState = EditorState.set(editorState, {allowUndo: false}); - newEditorState = clearOverflowInlineStyles(newEditorState); if (reachedLimit) { newEditorState = insertOverflowInlineStyles(newEditorState, overflow); } - newEditorState = EditorState.forceSelection( - newEditorState, - restoreSelection, - ); - newEditorState = EditorState.set(newEditorState, {allowUndo: true}); return newEditorState; } From 45c0d7832a56af21d1a31b413ba87c9d31633ded Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 13:51:03 +0200 Subject: [PATCH 0099/1070] e2e fix - authoring maintains helpline first option always selected --- .../apps/authoring/authoring/directives/ArticleEditDirective.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts index c061a5c670..4c42869a14 100644 --- a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts +++ b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts @@ -411,6 +411,8 @@ export function ArticleEditDirective( autosave.save(scope.item, scope.origItem); } + scope.refresh(); // reload footer editorState from HTML that was set here + // first option should always be selected, as multiple helplines could be added in footer _.defer(() => { var ddlHelpline = elem.find('#helplines'); From c1a2ae3c44de01124764b6cfa44298c865882806 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 13:53:41 +0200 Subject: [PATCH 0100/1070] e2e fix - open publish item with footer text without
tag --- e2e/client/specs/authoring_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index b12a209514..0f8659bb9e 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -568,7 +568,7 @@ describe('authoring', () => { authoring.publish(); monitoring.filterAction('text'); monitoring.actionOnItem('Open', 5, 0); - expect(element(by.css('#body_footer .medium-editor-element:not(.clone)')).getText()).not.toContain('
'); + expect(element(by.css('#body_footer [contenteditable]')).getText()).not.toContain('
'); }); it('maintains helpline first option always selected', () => { From 526c89cc50642525bf3b436836dd474d2e8a1068 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 13:57:17 +0200 Subject: [PATCH 0101/1070] update reading headline field --- e2e/client/specs/helpers/authoring.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 543bd1c0d6..3c23c46aaa 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -1106,7 +1106,7 @@ class Authoring { this.getArticleHeadlineOfBoard = function(index) { return this.getBoardArticle(index) - .all(by.css('.headline .medium-editor-element:not(.clone)')) + .all(by.css('.headline [contenteditable]')) .first() .getText(); }; From e80755a02e8027e963af58c1c5b38c78fff6b9be Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 17:19:31 +0200 Subject: [PATCH 0102/1070] e2e fix - Compare versions operations of an opened article via Compare versions menu option --- e2e/client/specs/authoring_spec.ts | 11 +++++++++-- scripts/core/editor3/directive.tsx | 10 +++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 0f8659bb9e..1df850d8d7 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -552,8 +552,15 @@ describe('authoring', () => { expect(authoring.getInnerDropdownItemVersions(1).count()).toBe(2); authoring.openItemVersionInBoard(1, 0); expect(authoring.getInnerDropdownItemVersions(0).count()).toBe(1); - expect(authoring.getHtmlArticleHeadlineOfBoard(0)).toContain( - 'item5 updated newly', + expect( + authoring.getHtmlArticleHeadlineOfBoard(0).then((text) => { + return text + .replace(/ data-text="true"/g, '') + .replace(/ data-offset-key=".+?"/g, ''); + }), + ).toContain( + 'item5 updated' + + ' newly', ); expect(authoring.getArticleHeadlineOfBoard(1)).toEqual('item5 updated'); }); diff --git a/scripts/core/editor3/directive.tsx b/scripts/core/editor3/directive.tsx index 2a3acea5ee..94317ec447 100644 --- a/scripts/core/editor3/directive.tsx +++ b/scripts/core/editor3/directive.tsx @@ -252,7 +252,15 @@ class Editor3Directive { 'insert-characters', ); - store.dispatch(changeEditorState(editorState)); + /** + * `onChange` handler needs to be skipped, because it is converting + * `editorState` to text or HTML and removes diff markup in the process. + * It then writes the result to item field and this triggers + * this exact watch with `newValue` without diff markup. + */ + const skipOnChangeHandler = true; + + store.dispatch(changeEditorState(editorState, false, skipOnChangeHandler)); }); } From 6e0da671b673ea56ca73f6f4ce04f5269e745fa4 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 28 Oct 2021 17:24:35 +0200 Subject: [PATCH 0103/1070] Revert "fix clearOverflowInlineStyles breaking undo" This reverts commit 56549ac3a8bc73bc84b9133f2e45b53e8aff2396. --- .../core/editor3/helpers/characters-limit.ts | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/scripts/core/editor3/helpers/characters-limit.ts b/scripts/core/editor3/helpers/characters-limit.ts index 558edc28f1..5caa8a8721 100644 --- a/scripts/core/editor3/helpers/characters-limit.ts +++ b/scripts/core/editor3/helpers/characters-limit.ts @@ -2,6 +2,8 @@ import { EditorState, Modifier, SelectionState, + DraftEditorCommand, + RichUtils, } from 'draft-js'; import {getEditorFieldCharactersCount} from 'apps/authoring/authoring/components/CharacterCount'; import getFragmentFromSelection from 'draft-js/lib/getFragmentFromSelection'; @@ -37,7 +39,6 @@ function getLengthOfSelectedText(editorState: EditorState) { } function clearOverflowInlineStyles(editorState: EditorState) { - const restoreSelection = editorState.getSelection(); const blockMap = editorState.getCurrentContent().getBlockMap(); // clear inline style from all text @@ -52,21 +53,12 @@ function clearOverflowInlineStyles(editorState: EditorState) { LIMIT_CHARACTERS_OVERFLOW_STYLE, ); - let newEditorState = EditorState.set(editorState, {allowUndo: false}); - - newEditorState = EditorState.push( - newEditorState, + let newEditorState = EditorState.push( + editorState, newContentState, 'change-inline-style', ); - newEditorState = EditorState.forceSelection( - newEditorState, - restoreSelection, - ); - - newEditorState = EditorState.set(editorState, {allowUndo: true}); - return newEditorState; } @@ -74,8 +66,6 @@ function insertOverflowInlineStyles( editorState: EditorState, overflow: number, ) { - const restoreSelection = editorState.getSelection(); - const blocks = editorState .getCurrentContent() .getBlocksAsArray() @@ -121,21 +111,12 @@ function insertOverflowInlineStyles( LIMIT_CHARACTERS_OVERFLOW_STYLE, ); - let newEditorState = EditorState.set(editorState, {allowUndo: false}); - - newEditorState = EditorState.push( - newEditorState, + let newEditorState = EditorState.push( + editorState, newContentState, 'change-inline-style', ); - newEditorState = EditorState.forceSelection( - newEditorState, - restoreSelection, - ); - - newEditorState = EditorState.set(newEditorState, {allowUndo: true}); - return newEditorState; } @@ -149,14 +130,21 @@ export function handleOverflowHighlights( return editorState; } - let newEditorState = editorState; + const restoreSelection = editorState.getSelection(); const overflow = length - limit; const reachedLimit = overflow > 0; + let newEditorState = EditorState.set(editorState, {allowUndo: false}); + newEditorState = clearOverflowInlineStyles(newEditorState); if (reachedLimit) { newEditorState = insertOverflowInlineStyles(newEditorState, overflow); } + newEditorState = EditorState.forceSelection( + newEditorState, + restoreSelection, + ); + newEditorState = EditorState.set(newEditorState, {allowUndo: true}); return newEditorState; } From 5b78febaa48e3e236825fce9a696aaf5fd56e7a8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 29 Oct 2021 11:12:21 +0200 Subject: [PATCH 0104/1070] To avoid undo/redo issues, don't attempt to clear inline styles if there are none. For details, read 56549ac3a commit message --- scripts/core/editor3/helpers/characters-limit.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/core/editor3/helpers/characters-limit.ts b/scripts/core/editor3/helpers/characters-limit.ts index 74bc55a63c..46cc8337d4 100644 --- a/scripts/core/editor3/helpers/characters-limit.ts +++ b/scripts/core/editor3/helpers/characters-limit.ts @@ -37,6 +37,18 @@ function getLengthOfSelectedText(editorState: EditorState) { } function clearOverflowInlineStyles(editorState: EditorState) { + const hasOverflowsMarked = editorState.getCurrentContent().getBlocksAsArray().some( + (block) => { + return new Array(block.getLength()).fill(null).some( + (_, i) => block.getInlineStyleAt(i).has(LIMIT_CHARACTERS_OVERFLOW_STYLE), + ); + }, + ); + + if (hasOverflowsMarked === false) { + return editorState; + } + const restoreSelection = editorState.getSelection(); const blockMap = editorState.getCurrentContent().getBlockMap(); From 197cb409df6db60ece5201f8ea5452150880176e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 29 Oct 2021 12:28:11 +0200 Subject: [PATCH 0105/1070] update lock file --- package-lock.json | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfb25cfd32..52965a3973 100644 --- a/package-lock.json +++ b/package-lock.json @@ -404,9 +404,9 @@ } }, "@types/node": { - "version": "16.11.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.3.tgz", - "integrity": "sha512-aIYL9Eemcecs1y77XzFGiSc+FdfN58k4J23UEe6+hynf4Wd9g4DzQPwIKL080vSMuubFqy2hWwOzCtJdc6vFKw==" + "version": "16.11.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz", + "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==" }, "@types/parse5": { "version": "5.0.3", @@ -2049,9 +2049,9 @@ } }, "caniuse-db": { - "version": "1.0.30001271", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001271.tgz", - "integrity": "sha512-V7/O06sNu6e54ArdzLA1xFuYJ+kK9XXsO4pYa53ixujAVX/OVCGvDfRICSgkxdk8pdMZ+tA1v5ylLKDHNwUqEg==" + "version": "1.0.30001272", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001272.tgz", + "integrity": "sha512-/NplzwUm4ZCpKOJs/zq3newlycZ/T7sW9xVFINmDyRBmmSoqTpQQTAJ0f+a4xfOODI8T6aM23GGGVQwoxZAgdw==" }, "caseless": { "version": "0.12.0", @@ -3616,9 +3616,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.877", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.877.tgz", - "integrity": "sha512-fT5mW5Giw5iyVukeHb2XvB4joBKvzHtl8Vs3QzE7APATpFMt/T7RWyUcIKSZzYkKQgpMbu+vDBTCHfQZvh8klA==" + "version": "1.3.884", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.884.tgz", + "integrity": "sha512-kOaCAa+biA98PwH5BpCkeUeTL6mCeg8p3Q3OhqzPyqhu/5QUnWAN2wr/3IK8xMQxIV76kfoQpP+Bn/wij/jXrg==" }, "elliptic": { "version": "6.5.4", @@ -4543,9 +4543,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" } } }, @@ -4558,9 +4558,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" } } }, @@ -11745,6 +11745,11 @@ "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz", "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0=" }, + "popper-max-size-modifier": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/popper-max-size-modifier/-/popper-max-size-modifier-0.2.0.tgz", + "integrity": "sha512-UerPt9pZfTFnpSpIBVJrR3ibHMuU1k5K01AyNLfMUWCr4z1MFH+dsayPlAF9ZeYExa02HPiQn5OIMqUSVtJEbg==" + }, "popper.js": { "version": "1.14.4", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", @@ -12430,9 +12435,9 @@ "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "version": "0.8.18", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz", + "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==", "requires": { "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", @@ -12440,7 +12445,7 @@ "object-assign": "^4.1.0", "promise": "^7.1.1", "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" + "ua-parser-js": "^0.7.30" } }, "object-assign": { @@ -15395,9 +15400,9 @@ }, "dependencies": { "@types/node": { - "version": "14.17.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.28.tgz", - "integrity": "sha512-1Nh2wEWN8y9hyC4yTDPccUnRunqNeBEFmmTU+K5FpGZOEixqAzMhUXzrBwajNYCZq5uoGaztaMN9Yy1PDMMB6Q==" + "version": "14.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz", + "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==" } } }, @@ -15909,9 +15914,9 @@ } }, "ua-parser-js": { - "version": "0.7.30", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.30.tgz", - "integrity": "sha512-uXEtSresNUlXQ1QL4/3dQORcGv7+J2ookOG2ybA/ga9+HYEXueT2o+8dUJQkpedsyTyCJ6jCCirRcKtdtx1kbg==" + "version": "0.7.31", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz", + "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==" }, "uglify-js": { "version": "2.4.6", From a2c3ec9687c06e2440dadde07c0be25651e744f7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 29 Oct 2021 12:50:12 +0200 Subject: [PATCH 0106/1070] fix e2e - remove editor2-specific embed test, fix undo/redo test --- e2e/client/specs/authoring_spec.ts | 89 +----------------------------- 1 file changed, 3 insertions(+), 86 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 1df850d8d7..e56d7aecec 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -42,61 +42,7 @@ describe('authoring', () => { monitoring.openMonitoring(); }); - it('add an embed and respect the order', () => { - // try with same block content - monitoring.actionOnItem('Edit', 2, 0); - authoring.cleanBodyHtmlElement(); - authoring.writeText('line\n'); - authoring.addEmbed('embed'); - var thirdBlockContext = element(by.model('item.body_html')).all(by.repeater('block in vm.blocks')).get(2); - - thirdBlockContext.all(by.css('.editor-type-html')).first().sendKeys('line\n'); - authoring.addEmbed('embed', thirdBlockContext); - authoring.blockContains(0, 'line'); - authoring.blockContains(1, 'embed'); - authoring.blockContains(2, 'line'); - authoring.blockContains(3, 'embed'); - authoring.close(); - authoring.ignore(); - // with different block content - monitoring.actionOnItem('Edit', 2, 0); - authoring.cleanBodyHtmlElement(); - function generateLines(from, to) { - var lines = ''; - - for (var j = from; j < to; j++) { - lines += 'line ' + j + '\n'; - } - return lines; - } - var body1 = generateLines(0, 8); - var body2 = generateLines(8, 15); - var body3 = generateLines(15, 20); - - authoring.writeText(body1 + body2 + body3.trim()); - authoring.writeText( - protractor.Key.HOME + - protractor.Key.UP.repeat(4) + - protractor.Key.ENTER + - protractor.Key.UP, - ); - - authoring.addEmbed('Embed at position 15'); - authoring.blockContains(0, (body1 + body2).replace(/\n$/, '')); - authoring.blockContains(2, body3.replace(/\n$/, '')); - authoring.writeText( - protractor.Key.UP.repeat(7) + - protractor.Key.ENTER, - ); - authoring.addEmbed('Embed at position 8'); - authoring.blockContains(0, body1.replace(/\n$/, '')); - authoring.blockContains(2, body2.replace(/\n$/, '')); - authoring.blockContains(4, body3.replace(/\n$/, '')); - }); - - it('authoring operations', () => { - // undo and redo operations by using CTRL+Z and CTRL+y ... - // ... from a new item + it('can undo and redo', () => { authoring.createTextItem(); browser.sleep(1000); authoring.writeText('to be undone'); @@ -106,38 +52,9 @@ describe('authoring', () => { expect(authoring.getBodyText()).toBe(''); ctrlKey('y'); expect(authoring.getBodyText()).toBe('to be undone'); - authoring.writeText(protractor.Key.HOME + protractor.Key.ENTER + protractor.Key.UP); - authoring.addEmbed('Embed'); - authoring.blockContains(1, 'Embed'); - authoring.blockContains(2, 'to be undone'); - commandKey('z'); - authoring.blockContains(0, 'to be undone'); - commandKey('y'); - authoring.blockContains(1, 'Embed'); - authoring.blockContains(2, 'to be undone'); - - authoring.cutBlock(1); - authoring.blockContains(0, 'to be undone'); - ctrlKey('z'); - authoring.blockContains(1, 'Embed'); - authoring.blockContains(2, 'to be undone'); - authoring.close(); - authoring.ignore(); - // ... from an existing item - expect(monitoring.getTextItem(2, 0)).toBe('item5'); - monitoring.actionOnItem('Edit', 2, 0); - expect(authoring.getBodyText()).toBe('item5 text'); - authoring.writeText(' Two'); - expect(authoring.getBodyText()).toBe('item5 text Two'); - authoring.writeText(' Words'); - expect(authoring.getBodyText()).toBe('item5 text Two Words'); - ctrlKey('z'); - expect(authoring.getBodyText()).toBe('item5 text Two'); - ctrlKey('y'); - expect(authoring.getBodyText()).toBe('item5 text Two Words'); - authoring.save(); - authoring.close(); + }); + it('authoring operations', () => { // allows to create a new empty package monitoring.createItemAction('create_package'); expect(element(by.className('packaging-screen')).isDisplayed()).toBe(true); From 38173eb1eee96def206d95535df23b9fd862d3b7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 29 Oct 2021 17:35:19 +0200 Subject: [PATCH 0107/1070] implement saving --- scripts/appConfig.ts | 1 + .../apps/authoring-react/authoring-react.tsx | 94 +++++++++++++++---- scripts/apps/authoring-react/data-layer.ts | 28 +++++- 3 files changed, 104 insertions(+), 19 deletions(-) diff --git a/scripts/appConfig.ts b/scripts/appConfig.ts index 32f57965bb..5714596c4f 100644 --- a/scripts/appConfig.ts +++ b/scripts/appConfig.ts @@ -37,6 +37,7 @@ export const debugInfo = { translationsLoaded: false, }; +// export const authoringReactViewEnabled = true; export const extensions: IExtensions = {}; diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index e9f62a16dd..b6555b4a02 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -1,9 +1,9 @@ import React from 'react'; import {IArticle} from 'superdesk-api'; -import {Button} from 'superdesk-ui-framework'; +import {Button, Loader} from 'superdesk-ui-framework'; import {gettext} from 'core/utils'; -import {dataApi} from 'core/helpers/CrudManager'; -import {getContentProfile, IContentProfileV2} from './data-layer'; +import {generatePatch} from 'core/helpers/CrudManager'; +import {IContentProfileV2, authoringStorage} from './data-layer'; import {AuthoringSection} from './authoring-section'; interface IProps { @@ -12,13 +12,18 @@ interface IProps { } interface IStateLoaded { - loading: false; + initialized: true; itemOriginal: IArticle; itemWithChanges: IArticle; profile: IContentProfileV2; + + /** + * Prevents changes to state while async operation is in progress(e.g. saving). + */ + loading: boolean; } -type IState = {loading: true} | IStateLoaded; +type IState = {initialized: false} | IStateLoaded; function waitForCssAnimation(): Promise { return new Promise((resolve) => { @@ -26,32 +31,49 @@ function waitForCssAnimation(): Promise { () => { resolve(); }, - - // transition time taken from styles/sass/layouts.scss #authoring-container - 500, + 500, // transition time taken from styles/sass/layouts.scss #authoring-container ); }); } - -function fetchArticle(id: IArticle['_id']): Promise { - // TODO: take published items into account - return dataApi.findOne('archive', id); -} - export class AuthoringReact extends React.PureComponent { constructor(props: IProps) { super(props); this.state = { - loading: true, + initialized: false, + }; + + this.save = this.save.bind(this); + + const setStateOriginal = this.setState.bind(this); + + this.setState = (...args) => { + const {state} = this; + + // disallow changing state while loading (for example when saving is in progress) + const allow: boolean = (() => { + if (state.initialized !== true) { + return true; + } else if (args[0]['loading'] === false) { + // it is allowed to change state while loading + // only if it sets loading to false + return true; + } else { + return state.loading === false; + } + })(); + + if (allow) { + setStateOriginal(...args); + } }; } componentDidMount() { Promise.all( [ - fetchArticle(this.props.itemId).then((item) => { - return getContentProfile(item).then((profile) => { + authoringStorage.getArticle(this.props.itemId).then((item) => { + return authoringStorage.getContentProfile(item).then((profile) => { return {item, profile}; }); }), @@ -61,6 +83,7 @@ export class AuthoringReact extends React.PureComponent { const [{item, profile}] = res; const nextState: IStateLoaded = { + initialized: true, loading: false, itemOriginal: Object.freeze(item), itemWithChanges: item, @@ -71,15 +94,43 @@ export class AuthoringReact extends React.PureComponent { }); } + save(state: IStateLoaded) { + const original = state.itemOriginal; + const patch = generatePatch(original, state.itemWithChanges); + + this.setState({ + ...state, + loading: true, + }); + + authoringStorage.saveArticle(original._id, original._etag, patch).then((item: IArticle) => { + const nextState: IStateLoaded = { + ...state, + loading: false, + itemOriginal: Object.freeze(item), + itemWithChanges: item, + }; + + this.setState(nextState); + }); + } + render() { const state = this.state; - if (state.loading === true) { + if (state.initialized !== true) { return null; } return (
+ + { + state.loading && ( + + ) + } +

{gettext('Toolbar')}

@@ -90,6 +141,13 @@ export class AuthoringReact extends React.PureComponent { }} /> +
diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts index 85880a3ff2..7d53b737eb 100644 --- a/scripts/apps/authoring-react/data-layer.ts +++ b/scripts/apps/authoring-react/data-layer.ts @@ -1,6 +1,8 @@ import {OrderedMap} from 'immutable'; import {IArticle} from 'superdesk-api'; import ng from 'core/services/ng'; +import {httpRequestJsonLocal} from 'core/helpers/network'; +import {dataApi} from 'core/helpers/CrudManager'; interface IFieldBase { id: string; @@ -24,7 +26,7 @@ export interface IContentProfileV2 { content: IFieldsV2; } -export function getContentProfile(item: IArticle): Promise { +function getContentProfile(item: IArticle): Promise { interface IFakeScope { schema: any; editor: any; @@ -71,3 +73,27 @@ export function getContentProfile(item: IArticle): Promise { return profile; }); } + +interface IAuthoringStorage { + getArticle(id: string): Promise; + saveArticle(id: string, etag: string, diff: Partial): Promise; + getContentProfile(item: IArticle): Promise; +} + +export const authoringStorage: IAuthoringStorage = { + getArticle: (id) => { + // TODO: take published items into account + return dataApi.findOne('archive', id); + }, + saveArticle: (id, etag, diff) => { + return httpRequestJsonLocal({ + method: 'PATCH', + path: `/archive/${id}`, + payload: diff, + headers: { + 'If-Match': etag, + }, + }); + }, + getContentProfile, +}; From 9c47edc30efaac19977e812f7e2cd0410a1b9c00 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 2 Nov 2021 09:46:05 +0100 Subject: [PATCH 0108/1070] unlock before closing --- scripts/apps/authoring-react/authoring-react.tsx | 9 ++++++++- scripts/apps/authoring-react/data-layer.ts | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index b6555b4a02..d7636517ed 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -137,7 +137,14 @@ export class AuthoringReact extends React.PureComponent {
+ +
+
+
+ +
+ { + this.props.items.map(({article, editor, fields}, i) => ( +
+ { // always start a new article on a new page in print mode + i > 0 && ( +
+
+
+
+ ) + } + +
+ +
+
+ )) + } +
+
+ ); + } +} + +export function previewItems(articles: Array) { + const el = document.createElement('div'); + + el.classList.add('print-container'); + document.body.appendChild(el); + + Promise.all( + articles.map((article) => getProfile(article).then(({editor, fields}) => ({article, editor, fields}))), + ).then((items) => { + ReactDOM.render( + ( + { + ReactDOM.unmountComponentAtNode(el); + el.remove(); + }} + /> + ), + el, + ); + }); +} diff --git a/styles/sass/app.scss b/styles/sass/app.scss index d46d3694c0..8dd5d59c33 100644 --- a/styles/sass/app.scss +++ b/styles/sass/app.scss @@ -65,5 +65,6 @@ @import 'saved-searches'; @import '../../scripts/apps/dashboard/widget-heading.scss'; @import '../../scripts/apps/authoring-react/authoring-react.scss'; +@import '../../scripts/apps/authoring/preview/full-preview.scss'; @import '../../scripts/apps/authoring/authoring/services/quick-publish-modal.scss' From 42287809002d17d624a4a7bdcd85e12c135f8ec8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 3 Nov 2021 19:42:09 +0100 Subject: [PATCH 0115/1070] use new preview, remove old one --- .../directives/AuthoringDirective.ts | 8 +- .../directives/FullPreviewDirective.ts | 40 ---------- .../directives/FullPreviewItemDirective.ts | 21 ----- scripts/apps/authoring/authoring/index.ts | 6 -- scripts/apps/authoring/views/authoring.html | 7 -- .../authoring/views/full-preview-item.html | 8 -- .../apps/authoring/views/full-preview.html | 34 -------- .../search/controllers/get-bulk-actions.tsx | 3 +- .../apps/search/directives/MultiActionBar.ts | 8 -- .../apps/search/views/multi-action-bar.html | 7 -- scripts/core/internal-events.ts | 1 - scripts/core/menu/menu.ts | 14 ---- scripts/core/menu/views/superdesk-view.html | 8 -- styles/sass/layouts.scss | 80 ------------------- 14 files changed, 4 insertions(+), 241 deletions(-) delete mode 100644 scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts delete mode 100644 scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts delete mode 100644 scripts/apps/authoring/views/full-preview-item.html delete mode 100644 scripts/apps/authoring/views/full-preview.html diff --git a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts index 875e33ecb2..fdb6c698cd 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts @@ -20,6 +20,7 @@ import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId'; import {ITEM_STATE} from 'apps/archive/constants'; import {isMediaType} from 'core/helpers/item'; import {confirmPublish} from '../services/quick-publish-modal'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; /** * @ngdoc directive @@ -165,7 +166,6 @@ export function AuthoringDirective( $scope._isInProductionStates = !isPublished($scope.origItem); - $scope.fullPreview = false; $scope.proofread = false; $scope.referrerUrl = referrer.getReferrerUrl(); $scope.gettext = gettext; @@ -301,14 +301,10 @@ export function AuthoringDirective( $scope.openFullPreview = function($event) { if ($event.button === 0 && !$event.ctrlKey) { $event.preventDefault(); - $scope.fullPreview = true; + previewItems([$scope.item]); } }; - $scope.closeFullPreview = function() { - $scope.fullPreview = false; - }; - /** * Export the list of highlights as a text item. */ diff --git a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts b/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts deleted file mode 100644 index 4e28977a3a..0000000000 --- a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts +++ /dev/null @@ -1,40 +0,0 @@ -import _ from 'lodash'; - -FullPreviewDirective.$inject = ['$timeout', 'content', '$sce']; -export function FullPreviewDirective($timeout, content, $sce) { - return { - scope: { - items: '=', - closeAction: '=', - }, - templateUrl: 'scripts/apps/authoring/views/full-preview.html', - link: function(scope, elem, attr, ctrl) { - scope.hideMedia = false; - - scope.printPreview = function() { - angular.element('body').addClass('prepare-print'); - - var afterPrint = function() { - angular.element('body').removeClass('prepare-print'); - }; - - if (window.matchMedia) { - var mediaQueryList = window.matchMedia('print'); - - mediaQueryList.addListener((mql) => { - if (!mql.matches) { - afterPrint(); - } - }); - } - - window.onafterprint = afterPrint; - - $timeout(() => { - window.print(); - }, 200, false); - return false; - }; - }, - }; -} diff --git a/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts b/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts deleted file mode 100644 index 099854dc6d..0000000000 --- a/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts +++ /dev/null @@ -1,21 +0,0 @@ -import _ from 'lodash'; - -FullPreviewItemDirective.$inject = ['content', '$sce']; -export function FullPreviewItemDirective(content, $sce) { - return { - scope: { - item: '=', - hideMedia: '=', - }, - templateUrl: 'scripts/apps/authoring/views/full-preview-item.html', - link: function(scope, elem, attr, ctrl) { - // Prevent external code from modifying this scope directly. - const fakeScope: any = {}; - - content.setupAuthoring(scope.item.profile, fakeScope, scope.item).then(() => { - scope.editor = fakeScope.editor; - scope.fields = fakeScope.fields; - }); - }, - }; -} diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 69bb533ac6..121db16cbb 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -26,11 +26,8 @@ import {AuthoringWorkspaceService} from './services'; import {AuthoringMediaActions} from './authoring-media-actions'; import {sdStaticAutocompleteDirective} from './directives/sd-static-autocomplete'; import {VideoThumbnailEditor} from './components/video-thumbnail-editor'; -import {FullPreviewDirective} from './directives/FullPreviewDirective'; -import {FullPreviewItemDirective} from './directives/FullPreviewItemDirective'; import {AuthoringTopbar2React} from './authoring-topbar2-react'; import {appConfig} from 'appConfig'; -import {FullPreview} from '../preview/fullPreview'; import {sdApi} from 'api'; import {AuthoringIntegrationWrapper} from 'apps/authoring-react/authoring-integration-wrapper'; @@ -121,9 +118,6 @@ angular.module('superdesk.apps.authoring', [ .directive('sdAuthoringHeader', directive.AuthoringHeaderDirective) .directive('sdItemAssociation', directive.ItemAssociationDirective) .directive('sdItemCarousel', directive.ItemCarouselDirective) - .directive('sdFullPreview', FullPreviewDirective) - .directive('sdFullPreviewItem', FullPreviewItemDirective) - .component('sdFullPreviewReact', reactToAngular1(FullPreview, ['item', 'editor', 'fields', 'hideMedia'])) .directive('sdRemoveTags', directive.RemoveTagsDirective) .directive('tansaScopeSync', directive.TansaScopeSyncDirective) .directive('sdItemActionByIntent', directive.ItemActionsByIntentDirective) diff --git a/scripts/apps/authoring/views/authoring.html b/scripts/apps/authoring/views/authoring.html index 9b5284d04b..6b59d4db8a 100644 --- a/scripts/apps/authoring/views/authoring.html +++ b/scripts/apps/authoring/views/authoring.html @@ -18,13 +18,6 @@

Authoring

-
-
diff --git a/scripts/apps/authoring/views/full-preview.html b/scripts/apps/authoring/views/full-preview.html deleted file mode 100644 index 980a409bb1..0000000000 --- a/scripts/apps/authoring/views/full-preview.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-
- {{ 'Hide media' | translate }} -
-
- - -
- - -
-
-
- -
- -
- -
- -
-
- -
-
diff --git a/scripts/apps/search/controllers/get-bulk-actions.tsx b/scripts/apps/search/controllers/get-bulk-actions.tsx index 47927e74fe..4a03b52969 100644 --- a/scripts/apps/search/controllers/get-bulk-actions.tsx +++ b/scripts/apps/search/controllers/get-bulk-actions.tsx @@ -12,6 +12,7 @@ import {showModal} from 'core/services/modalService'; import {getModalForMultipleHighlights} from 'apps/highlights/components/SetHighlightsForMultipleArticlesModal'; import {dataApi} from 'core/helpers/CrudManager'; import {appConfig} from 'appConfig'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; export function getBulkActions( articles: Array, @@ -254,7 +255,7 @@ export function getBulkActions( Promise.all( ids.map((id) => dataApi.findOne('archive', id)), ).then((res: Array) => { - dispatchInternalEvent('openFullPreview', res); + previewItems(res); }); }, canAutocloseMultiActionBar: false, diff --git a/scripts/apps/search/directives/MultiActionBar.ts b/scripts/apps/search/directives/MultiActionBar.ts index 93036c3941..8a20b23e71 100644 --- a/scripts/apps/search/directives/MultiActionBar.ts +++ b/scripts/apps/search/directives/MultiActionBar.ts @@ -13,13 +13,11 @@ interface IScope extends ng.IScope { spike: any; publish: any; state: any; - printPreview: Array; toggleDisplay(): void; hideMultiActionBar(): void; hideMultiActionBar(): void; getActions(articles: Array): Array; isOpenItemType(type: any): boolean; - closePrintPreview(): void; } export function isOpenItemType(type) { @@ -60,12 +58,6 @@ export function MultiActionBar( scope.display = true; scope.$watch(multi.getItems, detectType); - scope.printPreview = []; - - scope.closePrintPreview = () => { - scope.printPreview = []; - }; - scope.$watch('multi.count', () => { scope.display = true; }); diff --git a/scripts/apps/search/views/multi-action-bar.html b/scripts/apps/search/views/multi-action-bar.html index d5d9e218ac..48629b8fcd 100644 --- a/scripts/apps/search/views/multi-action-bar.html +++ b/scripts/apps/search/views/multi-action-bar.html @@ -15,10 +15,3 @@ >
- -
\ No newline at end of file diff --git a/scripts/core/internal-events.ts b/scripts/core/internal-events.ts index 7f5b9e2ce8..6cf924c6f7 100644 --- a/scripts/core/internal-events.ts +++ b/scripts/core/internal-events.ts @@ -8,7 +8,6 @@ interface IInternalEvents { saveArticleInEditMode: void; dangerouslyOverwriteAuthoringData: Partial; changeUserPreferences: {[preferenceId: string]: any}; - openFullPreview: Array; openExportView: Array; extensionsHaveLoaded: true; } diff --git a/scripts/core/menu/menu.ts b/scripts/core/menu/menu.ts index 7962816f80..c1f60d65a9 100644 --- a/scripts/core/menu/menu.ts +++ b/scripts/core/menu/menu.ts @@ -65,19 +65,6 @@ angular.module('superdesk.core.menu', [ $timeout(() => window.dispatchEvent(new Event('resize')), 500, false); }); - // full preview - - $scope.fullPreviewItems = []; - - $scope.closeFullPreview = () => { - $scope.fullPreviewItems = []; - }; - - const removeMultiPreviewEventListener = addInternalEventListener('openFullPreview', (event) => { - $scope.fullPreviewItems = event.detail; - $scope.$apply(); - }); - $scope.itemsForExport = null; /** @@ -100,7 +87,6 @@ angular.module('superdesk.core.menu', [ // remove listeners $scope.$on('$destroy', () => { - removeMultiPreviewEventListener(); removeOpenExportListener(); }); } diff --git a/scripts/core/menu/views/superdesk-view.html b/scripts/core/menu/views/superdesk-view.html index b4e2c0a897..31b4742498 100644 --- a/scripts/core/menu/views/superdesk-view.html +++ b/scripts/core/menu/views/superdesk-view.html @@ -27,14 +27,6 @@
- -
-
diff --git a/styles/sass/layouts.scss b/styles/sass/layouts.scss index eef2e6e2fa..cd97cb80e4 100644 --- a/styles/sass/layouts.scss +++ b/styles/sass/layouts.scss @@ -1432,86 +1432,6 @@ $flex-grid-box-bg: white; } } -// PREPARE MODAL FOR PRINT -body.prepare-print { - margin-left: 1.5cm; - margin-right: 1.5cm; - - background: none! important; - overflow: visible !important; - color: black; - > * { - display: none !important; - } - > .modal--fullscreen { - position: static !important; - display: block !important; - width: 100%; - margin: 0; padding: 0; - background: none; - .modal-dialog { - display: block !important; - } - .association { - margin-bottom: 16px !important; - } - p { - font-size: 9pt !important; - line-height: 140% !important; - margin-bottom: 12px !important; - } - h2 { - font-size: 13pt !important; - } - h3 { - font-size: 10pt !important; - } - .headline { - font-size: 16pt !important; - margin-bottom: 16px !important; - } - .modal__body { - display: block !important; - padding: 0 !important; - } - .modal-content { - display: block !important; - > * { - display: none !important; - } - .byline { - font-size: 10pt !important; - margin-bottom: 20px !important; - } - > .modal-body { - display: block !important; - padding: 0 !important; - } - .preview-content { - max-width: 100% !important; - } - .metadata { - margin-top: 0 !important; - margin-bottom: 15px !important; - > div { - margin-bottom: 0 !important; - } - .preview-label label { - color: black; - } - .preview-data span { - border-radius: 0 !important; - background-color: transparent !important; - border-right: 1px solid black; - &:last-of-type { - border-right: 0 !important; - } - } - } - } - } -} - .loading-overlay { position: absolute; top: 0; From b8b3b6f4c4744b2eb12ee3bcf98ff8aa59918f33 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 4 Nov 2021 12:01:37 +0100 Subject: [PATCH 0116/1070] use full preview from monitor widget; remove unused code --- .../directives/ItemPreviewContainer.ts | 43 -------- scripts/apps/archive/directives/MediaView.ts | 102 ------------------ scripts/apps/archive/directives/SingleItem.ts | 10 -- scripts/apps/archive/directives/index.ts | 3 - scripts/apps/archive/index.tsx | 3 - scripts/apps/archive/tests/archive.spec.ts | 22 ---- scripts/apps/archive/views/media-view.html | 63 ----------- .../archive/views/single-item-preview.html | 30 ------ .../controllers/ProductionTestController.ts | 10 +- .../views/production-test-view.html | 1 - .../user-activity/components/Group.tsx | 7 -- .../controllers/LegalArchiveController.ts | 8 -- .../legal-archive/views/legal_archive.html | 1 - .../apps/monitoring/directives/WidgetGroup.ts | 1 - scripts/apps/search/components/WidgetItem.tsx | 6 +- .../apps/search/components/WidgetItemList.tsx | 2 - scripts/apps/search/directives/ItemPreview.ts | 1 - .../apps/search/directives/SearchResults.ts | 8 -- scripts/core/menu/views/superdesk-view.html | 2 - 19 files changed, 4 insertions(+), 319 deletions(-) delete mode 100644 scripts/apps/archive/directives/ItemPreviewContainer.ts delete mode 100644 scripts/apps/archive/directives/MediaView.ts delete mode 100644 scripts/apps/archive/directives/SingleItem.ts delete mode 100644 scripts/apps/archive/views/media-view.html delete mode 100644 scripts/apps/archive/views/single-item-preview.html diff --git a/scripts/apps/archive/directives/ItemPreviewContainer.ts b/scripts/apps/archive/directives/ItemPreviewContainer.ts deleted file mode 100644 index 457cec4824..0000000000 --- a/scripts/apps/archive/directives/ItemPreviewContainer.ts +++ /dev/null @@ -1,43 +0,0 @@ -import {IArticle} from 'superdesk-api'; -import {dispatchCustomEvent} from 'core/get-superdesk-api-implementation'; - -let itemInPreviewMode: IArticle | null = null; - -export function ItemPreviewContainer() { - return { - template: '
', - scope: {}, - link: function(scope) { - scope.item = null; - - scope.$on('intent:preview:item', (event, intent) => { - if (itemInPreviewMode != null) { - dispatchCustomEvent('articlePreviewEnd', itemInPreviewMode); - - itemInPreviewMode = null; - } - - if (intent.data != null) { - itemInPreviewMode = intent.data; - - dispatchCustomEvent('articlePreviewStart', itemInPreviewMode); - } - - scope.item = intent.data; - }); - - /** - * Close lightbox - */ - scope.close = function() { - scope.item = null; - - if (itemInPreviewMode != null) { - dispatchCustomEvent('articlePreviewEnd', itemInPreviewMode); - - itemInPreviewMode = null; - } - }; - }, - }; -} diff --git a/scripts/apps/archive/directives/MediaView.ts b/scripts/apps/archive/directives/MediaView.ts deleted file mode 100644 index e4a6c04c9b..0000000000 --- a/scripts/apps/archive/directives/MediaView.ts +++ /dev/null @@ -1,102 +0,0 @@ -import _ from 'lodash'; - -MediaView.$inject = ['keyboardManager', 'packages']; - -export function MediaView(keyboardManager, packages) { - return { - templateUrl: 'scripts/apps/archive/views/media-view.html', - scope: { - items: '=', - item: '=', - close: '&', - }, - link: function(scope, elem) { - var packageStack = []; - - scope.singleItem = null; - scope.packageItem = null; - - scope.prevEnabled = true; - scope.nextEnabled = true; - - var getIndex = function(item) { - return _.findIndex(scope.items, {_id: item._id}); - }; - - var setItem = function(item) { - resetStack(); - scope.item = item; - scope.openItem(item); - var index = getIndex(scope.item); - - scope.prevEnabled = index > -1 && !!scope.items[index - 1]; - scope.nextEnabled = index > -1 && !!scope.items[index + 1]; - }; - - scope.prev = function() { - var index = getIndex(scope.item); - - if (index > 0) { - setItem(scope.items[index - 1]); - } - }; - scope.next = function() { - var index = getIndex(scope.item); - - if (index !== -1 && index < scope.items.length - 1) { - setItem(scope.items[index + 1]); - } - }; - - keyboardManager.push('left', scope.prev); - keyboardManager.push('right', scope.next); - keyboardManager.bind('esc', () => { - scope.close(); - }, {global: true}); - scope.$on('$destroy', () => { - keyboardManager.pop('left'); - keyboardManager.pop('right'); - keyboardManager.unbind('esc'); - }); - - scope.setPackageSingle = function(packageItem) { - packages.fetchItem(packageItem).then((item) => { - scope.openItem(item); - }); - }; - - scope.openItem = function(item) { - if (item.type === 'composite') { - packageStack.push(item); - pickPackageItem(); - } - scope.setSingleItem(item); - }; - - scope.setSingleItem = function(item) { - scope.singleItem = item; - }; - - scope.nested = function() { - return packageStack.length > 1; - }; - - scope.previousPackage = function() { - _.remove(packageStack, _.last(packageStack)); - pickPackageItem(); - scope.setSingleItem(scope.packageItem); - }; - - var pickPackageItem = function() { - scope.packageItem = _.last(packageStack) || null; - }; - - var resetStack = function() { - packageStack = []; - scope.packageItem = null; - }; - - setItem(scope.item); - }, - }; -} diff --git a/scripts/apps/archive/directives/SingleItem.ts b/scripts/apps/archive/directives/SingleItem.ts deleted file mode 100644 index e855d7a14e..0000000000 --- a/scripts/apps/archive/directives/SingleItem.ts +++ /dev/null @@ -1,10 +0,0 @@ -export function SingleItem() { - return { - templateUrl: 'scripts/apps/archive/views/single-item-preview.html', - scope: { - item: '=', - contents: '=', - setitem: '&', - }, - }; -} diff --git a/scripts/apps/archive/directives/index.ts b/scripts/apps/archive/directives/index.ts index 11e5cdf56d..4fab563ca0 100644 --- a/scripts/apps/archive/directives/index.ts +++ b/scripts/apps/archive/directives/index.ts @@ -2,12 +2,9 @@ export {ItemLock} from './ItemLock'; export {ItemState} from './ItemState'; export {InlineMeta} from './InlineMeta'; export {MediaPreview, MediaPreviewWidget} from './MediaPreview'; -export {ItemPreviewContainer} from './ItemPreviewContainer'; -export {MediaView} from './MediaView'; export {MediaMetadata} from './MediaMetadata'; export {FetchedDesks} from './FetchedDesks'; export {MetaIngest} from './MetaIngest'; -export {SingleItem} from './SingleItem'; export {DraggableItem} from './DraggableItem'; export {ItemCrops} from './ItemCrops'; export {ItemRendition} from './ItemRendition'; diff --git a/scripts/apps/archive/index.tsx b/scripts/apps/archive/index.tsx index a8193cc09a..72870f9552 100644 --- a/scripts/apps/archive/index.tsx +++ b/scripts/apps/archive/index.tsx @@ -37,13 +37,10 @@ angular.module('superdesk.apps.archive.directives', [ .directive('sdInlineMeta', directive.InlineMeta) .directive('sdMediaPreview', directive.MediaPreview) .directive('sdMediaPreviewWidget', directive.MediaPreviewWidget) - .directive('sdItemPreviewContainer', directive.ItemPreviewContainer) - .directive('sdMediaView', directive.MediaView) .directive('sdMediaMetadata', directive.MediaMetadata) .component('sdRelatedView', reactToAngular1(RelatedView, ['relatedItems'], [])) .directive('sdFetchedDesks', directive.FetchedDesks) .directive('sdMetaIngest', directive.MetaIngest) - .directive('sdSingleItem', directive.SingleItem) .directive('sdDraggableItem', directive.DraggableItem) .directive('sdItemCrops', directive.ItemCrops) .directive('sdItemRendition', directive.ItemRendition) diff --git a/scripts/apps/archive/tests/archive.spec.ts b/scripts/apps/archive/tests/archive.spec.ts index a9eadbab42..f2ab43865d 100644 --- a/scripts/apps/archive/tests/archive.spec.ts +++ b/scripts/apps/archive/tests/archive.spec.ts @@ -256,28 +256,6 @@ describe('content', () => { })); }); - describe('item preview container', () => { - it('can handle preview:item intent', inject(($rootScope, $compile, superdesk) => { - var scope = $rootScope.$new(); - var elem = $compile('
')(scope); - - scope.$digest(); - - var iscope = elem.isolateScope(); - - expect(iscope.item).toBe(null); - - scope.$apply(() => { - superdesk.intent('preview', 'item', item); - }); - - expect(iscope.item).toBe(item); - - iscope.close(); - expect(iscope.item).toBe(null); - })); - }); - describe('item preview header', () => { it('on toggle sets the header state in local storage', inject(($rootScope, $compile, storage) => { storage.clear(); diff --git a/scripts/apps/archive/views/media-view.html b/scripts/apps/archive/views/media-view.html deleted file mode 100644 index 5d8853c469..0000000000 --- a/scripts/apps/archive/views/media-view.html +++ /dev/null @@ -1,63 +0,0 @@ -
- - - -
-
- -
-
- - - - - - -
{{ packageItem.headline }}
-
-
-
    -
    -
-
-
- - - -
- -
- - - - -
- - -
-
-
{{ singleItem.headline }}
- - {{ 'Created:'|translate }} {{ singleItem.firstcreated|date:'medium' }} - {{ 'Modified:'|translate }} {{ singleItem.versioncreated|date:'medium' }} - - - -
- -
- -
-
-
-
-
-
-
-
-
-
diff --git a/scripts/apps/archive/views/single-item-preview.html b/scripts/apps/archive/views/single-item-preview.html deleted file mode 100644 index 77d246aec9..0000000000 --- a/scripts/apps/archive/views/single-item-preview.html +++ /dev/null @@ -1,30 +0,0 @@ -
- - -
- -
- - -
-
-
- - -
-
-
{{ item.headline }}
-
- {{ item.slugline || item.headline }} -
-
-
-
- - -
-
-
- -
{{ item.headline }}
-
diff --git a/scripts/apps/content-filters/controllers/ProductionTestController.ts b/scripts/apps/content-filters/controllers/ProductionTestController.ts index d32109cbe4..4bf652e366 100644 --- a/scripts/apps/content-filters/controllers/ProductionTestController.ts +++ b/scripts/apps/content-filters/controllers/ProductionTestController.ts @@ -38,15 +38,7 @@ export function ProductionTestController($scope, contentFilters, notify, $locati $scope.preview = function(Item) { $location.search('_id', Item ? Item._id : Item); }; - $scope.openView = function(item) { - $scope.openLightbox(item); - }; - $scope.openLightbox = function(item) { - $scope.selected.view = item; - }; - $scope.closeLightbox = function() { - $scope.selected.view = null; - }; + $scope.hideActions = function() { return true; }; diff --git a/scripts/apps/content-filters/views/production-test-view.html b/scripts/apps/content-filters/views/production-test-view.html index ccb56d4487..1f08bd3f74 100644 --- a/scripts/apps/content-filters/views/production-test-view.html +++ b/scripts/apps/content-filters/views/production-test-view.html @@ -66,4 +66,3 @@

-
diff --git a/scripts/apps/dashboard/user-activity/components/Group.tsx b/scripts/apps/dashboard/user-activity/components/Group.tsx index c04f6f2ec2..bc7a652176 100644 --- a/scripts/apps/dashboard/user-activity/components/Group.tsx +++ b/scripts/apps/dashboard/user-activity/components/Group.tsx @@ -55,13 +55,6 @@ export class GroupComponent extends React.Component { empty: gettext('No results for this user'), }} canEdit={true} - preview={(item: IArticle) => { - this.services.superdesk.intent( - 'preview', - 'item', - item, - ); - }} select={(item: IArticle) => { this.services.superdesk.intent( 'preview', diff --git a/scripts/apps/legal-archive/controllers/LegalArchiveController.ts b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts index 9db117c150..d2ec03f07a 100644 --- a/scripts/apps/legal-archive/controllers/LegalArchiveController.ts +++ b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts @@ -44,14 +44,6 @@ export function LegalArchiveController($scope, $location, legal, preferencesServ } }; - $scope.openLightbox = function() { - $scope.selected.view = $scope.selected.preview; - }; - - $scope.closeLightbox = function() { - $scope.selected.view = null; - }; - $scope.clear = function() { legal.criteria = $scope.criteria = {}; $scope.search(); diff --git a/scripts/apps/legal-archive/views/legal_archive.html b/scripts/apps/legal-archive/views/legal_archive.html index 8b309f29b4..291096f258 100644 --- a/scripts/apps/legal-archive/views/legal_archive.html +++ b/scripts/apps/legal-archive/views/legal_archive.html @@ -141,4 +141,3 @@
-
diff --git a/scripts/apps/monitoring/directives/WidgetGroup.ts b/scripts/apps/monitoring/directives/WidgetGroup.ts index a019525c63..c153228a81 100644 --- a/scripts/apps/monitoring/directives/WidgetGroup.ts +++ b/scripts/apps/monitoring/directives/WidgetGroup.ts @@ -430,7 +430,6 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q, canEdit: scope.canEdit, customMonitoringWidget: $rootScope.config.features.customMonitoringWidget, svc: services, - preview: scope.preview, select: scope.select, edit: scope.edit, }; diff --git a/scripts/apps/search/components/WidgetItem.tsx b/scripts/apps/search/components/WidgetItem.tsx index c5ab46c7ed..ff58acf895 100644 --- a/scripts/apps/search/components/WidgetItem.tsx +++ b/scripts/apps/search/components/WidgetItem.tsx @@ -5,13 +5,13 @@ import {gettext} from 'core/utils'; import {IArticle} from 'superdesk-api'; import {querySelectorParent} from 'core/helpers/dom/querySelectorParent'; import ng from 'core/services/ng'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; interface IProps { - item?: any; + item?: IArticle; selected?: boolean; canEdit?: boolean; customMonitoringWidget?: boolean; - preview: (item: IArticle) => void; select: (item: IArticle) => void; edit: (item: IArticle) => void; } @@ -35,7 +35,7 @@ export class WidgetItem extends React.Component { } preview() { - this.props.preview(this.item); + previewItems([this.item]); } select(e) { diff --git a/scripts/apps/search/components/WidgetItemList.tsx b/scripts/apps/search/components/WidgetItemList.tsx index 708a311593..265b39c20a 100644 --- a/scripts/apps/search/components/WidgetItemList.tsx +++ b/scripts/apps/search/components/WidgetItemList.tsx @@ -7,7 +7,6 @@ import {generateTrackByIdentifier} from '../services/SearchService'; interface IProps { canEdit?: boolean; customMonitoringWidget?: boolean; - preview: (item: IArticle) => void; select: (item: IArticle) => void; edit: (item: IArticle) => void; customUIMessages?: { @@ -59,7 +58,6 @@ export class WidgetItemList extends React.Component { customMonitoringWidget={ this.props.customMonitoringWidget } - preview={this.props.preview} select={this.props.select} edit={this.props.edit} /> diff --git a/scripts/apps/search/directives/ItemPreview.ts b/scripts/apps/search/directives/ItemPreview.ts index fa2f0aa0f0..c616748f0f 100644 --- a/scripts/apps/search/directives/ItemPreview.ts +++ b/scripts/apps/search/directives/ItemPreview.ts @@ -41,7 +41,6 @@ export function ItemPreview(asset, storage, desks, _, familyService, privileges) scope: { item: '=', close: '&', - openLightbox: '=', openSingleItem: '=', hideActionsMenu: '=', showHistoryTab: '=', diff --git a/scripts/apps/search/directives/SearchResults.ts b/scripts/apps/search/directives/SearchResults.ts index e24ef7f8bd..d3b8a0e4ed 100644 --- a/scripts/apps/search/directives/SearchResults.ts +++ b/scripts/apps/search/directives/SearchResults.ts @@ -481,14 +481,6 @@ export function SearchResults( $location.search('_id', item ? item._id : null); } - scope.openLightbox = function openLightbox() { - scope.selected.view = scope.selected.preview; - }; - - scope.closeLightbox = function closeLightbox() { - scope.selected.view = null; - }; - scope.openSingleItem = function(packageItem) { packages.fetchItem(packageItem).then((item) => { scope.selected.view = item; diff --git a/scripts/core/menu/views/superdesk-view.html b/scripts/core/menu/views/superdesk-view.html index 31b4742498..06bde18bf4 100644 --- a/scripts/core/menu/views/superdesk-view.html +++ b/scripts/core/menu/views/superdesk-view.html @@ -24,14 +24,12 @@
-
-
From be94d8423394e74c53f3cede6941db721f644bd3 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 3 Nov 2021 19:23:17 +0100 Subject: [PATCH 0117/1070] react-only full preview --- .../apps/authoring/preview/full-preview.scss | 47 ++++++ .../authoring/preview/fullPreviewMultiple.tsx | 157 ++++++++++++++++++ styles/sass/app.scss | 1 + 3 files changed, 205 insertions(+) create mode 100644 scripts/apps/authoring/preview/full-preview.scss create mode 100644 scripts/apps/authoring/preview/fullPreviewMultiple.tsx diff --git a/scripts/apps/authoring/preview/full-preview.scss b/scripts/apps/authoring/preview/full-preview.scss new file mode 100644 index 0000000000..d6bcfc030c --- /dev/null +++ b/scripts/apps/authoring/preview/full-preview.scss @@ -0,0 +1,47 @@ +.sd-full-preview { + display: flex; + flex-direction: column; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 1050; + background: white; +} + +.sd-full-preview--header { + display: flex; + justify-content: space-between; + padding: 0.8rem 1.6rem; + border-bottom: 1px solid #c5c5c5; +} + +.sd-full-preview--content-wrapper { + padding-top: 1.6rem; + flex-shrink: 1; + overflow-y: auto; +} + +.sd-full-preview--content { + width: 100%; + max-width: 700px; + margin: 0 auto; + + img { + max-width: 100%; + } +} + +@media print +{ + body.prepare-to-print { + > *:not(.print-container) { + display: none; + } + + .sd-full-preview { + position: static; + } + } +} diff --git a/scripts/apps/authoring/preview/fullPreviewMultiple.tsx b/scripts/apps/authoring/preview/fullPreviewMultiple.tsx new file mode 100644 index 0000000000..9645786729 --- /dev/null +++ b/scripts/apps/authoring/preview/fullPreviewMultiple.tsx @@ -0,0 +1,157 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import {Button} from 'superdesk-ui-framework'; +import {IArticle} from 'superdesk-api'; +import ng from 'core/services/ng'; +import {FullPreview} from './fullPreview'; +import {gettext} from 'core/utils'; + +function getProfile(item: IArticle): Promise<{editor: any; fields: any}> { + const fakeScope: any = {}; + + const content = ng.get('content'); + + return content.setupAuthoring(item.profile, fakeScope, item).then(() => { + const {editor, fields} = fakeScope; + + return {editor, fields}; + }); +} + +function prepareAndPrint() { + document.body.classList.add('prepare-to-print'); + + const afterPrintFns: Array<() => void> = [ + () => document.body.classList.remove('prepare-to-print'), + ]; + + const afterPrint = () => { + afterPrintFns.forEach((fn) => fn()); + }; + + if (window.matchMedia) { + var mediaQueryList = window.matchMedia('print'); + + const handler = (mql) => { + if (!mql.matches) { + afterPrint(); + } + }; + + mediaQueryList.addListener(handler); + afterPrintFns.push(() => mediaQueryList.removeListener(handler)); + } + + window.onafterprint = afterPrint; + + window.print(); +} + +interface IProps { + items: Array<{article: IArticle; editor: any; fields: any}>; + close(): void; +} + +interface IState { + hideMedia: boolean; +} + +class FullPreviewMultiple extends React.PureComponent { + constructor(props: IProps) { + super(props); + + this.state = { + hideMedia: false, + }; + } + render() { + return ( +
+
+
+
+ +
+
+
+ +
+ { + this.props.items.map(({article, editor, fields}, i) => ( +
+ { // always start a new article on a new page in print mode + i > 0 && ( +
+
+
+
+ ) + } + +
+ +
+
+ )) + } +
+
+ ); + } +} + +export function previewItems(articles: Array) { + const el = document.createElement('div'); + + el.classList.add('print-container'); + document.body.appendChild(el); + + Promise.all( + articles.map((article) => getProfile(article).then(({editor, fields}) => ({article, editor, fields}))), + ).then((items) => { + ReactDOM.render( + ( + { + ReactDOM.unmountComponentAtNode(el); + el.remove(); + }} + /> + ), + el, + ); + }); +} diff --git a/styles/sass/app.scss b/styles/sass/app.scss index ec9b6f042a..11ae8232f5 100644 --- a/styles/sass/app.scss +++ b/styles/sass/app.scss @@ -65,5 +65,6 @@ // Application components @import 'saved-searches'; @import '../../scripts/apps/dashboard/widget-heading.scss'; +@import '../../scripts/apps/authoring/preview/full-preview.scss'; @import '../../scripts/apps/authoring/authoring/services/quick-publish-modal.scss' From 00748b14d3c2132c9b5fa8c261ce8af8008266cb Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 3 Nov 2021 19:42:09 +0100 Subject: [PATCH 0118/1070] use new preview, remove old one --- .../directives/AuthoringDirective.ts | 8 +- .../directives/FullPreviewDirective.ts | 40 ---------- .../directives/FullPreviewItemDirective.ts | 21 ----- scripts/apps/authoring/authoring/index.ts | 6 -- scripts/apps/authoring/views/authoring.html | 7 -- .../authoring/views/full-preview-item.html | 8 -- .../apps/authoring/views/full-preview.html | 34 -------- .../search/controllers/get-bulk-actions.tsx | 3 +- .../apps/search/directives/MultiActionBar.ts | 8 -- .../apps/search/views/multi-action-bar.html | 7 -- scripts/core/internal-events.ts | 1 - scripts/core/menu/menu.ts | 14 ---- scripts/core/menu/views/superdesk-view.html | 8 -- styles/sass/layouts.scss | 80 ------------------- 14 files changed, 4 insertions(+), 241 deletions(-) delete mode 100644 scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts delete mode 100644 scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts delete mode 100644 scripts/apps/authoring/views/full-preview-item.html delete mode 100644 scripts/apps/authoring/views/full-preview.html diff --git a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts index 875e33ecb2..fdb6c698cd 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts @@ -20,6 +20,7 @@ import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId'; import {ITEM_STATE} from 'apps/archive/constants'; import {isMediaType} from 'core/helpers/item'; import {confirmPublish} from '../services/quick-publish-modal'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; /** * @ngdoc directive @@ -165,7 +166,6 @@ export function AuthoringDirective( $scope._isInProductionStates = !isPublished($scope.origItem); - $scope.fullPreview = false; $scope.proofread = false; $scope.referrerUrl = referrer.getReferrerUrl(); $scope.gettext = gettext; @@ -301,14 +301,10 @@ export function AuthoringDirective( $scope.openFullPreview = function($event) { if ($event.button === 0 && !$event.ctrlKey) { $event.preventDefault(); - $scope.fullPreview = true; + previewItems([$scope.item]); } }; - $scope.closeFullPreview = function() { - $scope.fullPreview = false; - }; - /** * Export the list of highlights as a text item. */ diff --git a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts b/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts deleted file mode 100644 index 4e28977a3a..0000000000 --- a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts +++ /dev/null @@ -1,40 +0,0 @@ -import _ from 'lodash'; - -FullPreviewDirective.$inject = ['$timeout', 'content', '$sce']; -export function FullPreviewDirective($timeout, content, $sce) { - return { - scope: { - items: '=', - closeAction: '=', - }, - templateUrl: 'scripts/apps/authoring/views/full-preview.html', - link: function(scope, elem, attr, ctrl) { - scope.hideMedia = false; - - scope.printPreview = function() { - angular.element('body').addClass('prepare-print'); - - var afterPrint = function() { - angular.element('body').removeClass('prepare-print'); - }; - - if (window.matchMedia) { - var mediaQueryList = window.matchMedia('print'); - - mediaQueryList.addListener((mql) => { - if (!mql.matches) { - afterPrint(); - } - }); - } - - window.onafterprint = afterPrint; - - $timeout(() => { - window.print(); - }, 200, false); - return false; - }; - }, - }; -} diff --git a/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts b/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts deleted file mode 100644 index 099854dc6d..0000000000 --- a/scripts/apps/authoring/authoring/directives/FullPreviewItemDirective.ts +++ /dev/null @@ -1,21 +0,0 @@ -import _ from 'lodash'; - -FullPreviewItemDirective.$inject = ['content', '$sce']; -export function FullPreviewItemDirective(content, $sce) { - return { - scope: { - item: '=', - hideMedia: '=', - }, - templateUrl: 'scripts/apps/authoring/views/full-preview-item.html', - link: function(scope, elem, attr, ctrl) { - // Prevent external code from modifying this scope directly. - const fakeScope: any = {}; - - content.setupAuthoring(scope.item.profile, fakeScope, scope.item).then(() => { - scope.editor = fakeScope.editor; - scope.fields = fakeScope.fields; - }); - }, - }; -} diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 7bffa2759e..a39ee75d5d 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -26,11 +26,8 @@ import {AuthoringWorkspaceService} from './services'; import {AuthoringMediaActions} from './authoring-media-actions'; import {sdStaticAutocompleteDirective} from './directives/sd-static-autocomplete'; import {VideoThumbnailEditor} from './components/video-thumbnail-editor'; -import {FullPreviewDirective} from './directives/FullPreviewDirective'; -import {FullPreviewItemDirective} from './directives/FullPreviewItemDirective'; import {AuthoringTopbar2React} from './authoring-topbar2-react'; import {appConfig} from 'appConfig'; -import {FullPreview} from '../preview/fullPreview'; import {sdApi} from 'api'; export interface IOnChangeParams { @@ -120,9 +117,6 @@ angular.module('superdesk.apps.authoring', [ .directive('sdAuthoringHeader', directive.AuthoringHeaderDirective) .directive('sdItemAssociation', directive.ItemAssociationDirective) .directive('sdItemCarousel', directive.ItemCarouselDirective) - .directive('sdFullPreview', FullPreviewDirective) - .directive('sdFullPreviewItem', FullPreviewItemDirective) - .component('sdFullPreviewReact', reactToAngular1(FullPreview, ['item', 'editor', 'fields', 'hideMedia'])) .directive('sdRemoveTags', directive.RemoveTagsDirective) .directive('tansaScopeSync', directive.TansaScopeSyncDirective) .directive('sdItemActionByIntent', directive.ItemActionsByIntentDirective) diff --git a/scripts/apps/authoring/views/authoring.html b/scripts/apps/authoring/views/authoring.html index 9b5284d04b..6b59d4db8a 100644 --- a/scripts/apps/authoring/views/authoring.html +++ b/scripts/apps/authoring/views/authoring.html @@ -18,13 +18,6 @@

Authoring

-
-
diff --git a/scripts/apps/authoring/views/full-preview.html b/scripts/apps/authoring/views/full-preview.html deleted file mode 100644 index 980a409bb1..0000000000 --- a/scripts/apps/authoring/views/full-preview.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-
- {{ 'Hide media' | translate }} -
-
- - -
- - -
-
-
- -
- -
- -
- -
-
- -
-
diff --git a/scripts/apps/search/controllers/get-bulk-actions.tsx b/scripts/apps/search/controllers/get-bulk-actions.tsx index 47927e74fe..4a03b52969 100644 --- a/scripts/apps/search/controllers/get-bulk-actions.tsx +++ b/scripts/apps/search/controllers/get-bulk-actions.tsx @@ -12,6 +12,7 @@ import {showModal} from 'core/services/modalService'; import {getModalForMultipleHighlights} from 'apps/highlights/components/SetHighlightsForMultipleArticlesModal'; import {dataApi} from 'core/helpers/CrudManager'; import {appConfig} from 'appConfig'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; export function getBulkActions( articles: Array, @@ -254,7 +255,7 @@ export function getBulkActions( Promise.all( ids.map((id) => dataApi.findOne('archive', id)), ).then((res: Array) => { - dispatchInternalEvent('openFullPreview', res); + previewItems(res); }); }, canAutocloseMultiActionBar: false, diff --git a/scripts/apps/search/directives/MultiActionBar.ts b/scripts/apps/search/directives/MultiActionBar.ts index 93036c3941..8a20b23e71 100644 --- a/scripts/apps/search/directives/MultiActionBar.ts +++ b/scripts/apps/search/directives/MultiActionBar.ts @@ -13,13 +13,11 @@ interface IScope extends ng.IScope { spike: any; publish: any; state: any; - printPreview: Array; toggleDisplay(): void; hideMultiActionBar(): void; hideMultiActionBar(): void; getActions(articles: Array): Array; isOpenItemType(type: any): boolean; - closePrintPreview(): void; } export function isOpenItemType(type) { @@ -60,12 +58,6 @@ export function MultiActionBar( scope.display = true; scope.$watch(multi.getItems, detectType); - scope.printPreview = []; - - scope.closePrintPreview = () => { - scope.printPreview = []; - }; - scope.$watch('multi.count', () => { scope.display = true; }); diff --git a/scripts/apps/search/views/multi-action-bar.html b/scripts/apps/search/views/multi-action-bar.html index d5d9e218ac..48629b8fcd 100644 --- a/scripts/apps/search/views/multi-action-bar.html +++ b/scripts/apps/search/views/multi-action-bar.html @@ -15,10 +15,3 @@ >
- -
\ No newline at end of file diff --git a/scripts/core/internal-events.ts b/scripts/core/internal-events.ts index 7f5b9e2ce8..6cf924c6f7 100644 --- a/scripts/core/internal-events.ts +++ b/scripts/core/internal-events.ts @@ -8,7 +8,6 @@ interface IInternalEvents { saveArticleInEditMode: void; dangerouslyOverwriteAuthoringData: Partial; changeUserPreferences: {[preferenceId: string]: any}; - openFullPreview: Array; openExportView: Array; extensionsHaveLoaded: true; } diff --git a/scripts/core/menu/menu.ts b/scripts/core/menu/menu.ts index 7962816f80..c1f60d65a9 100644 --- a/scripts/core/menu/menu.ts +++ b/scripts/core/menu/menu.ts @@ -65,19 +65,6 @@ angular.module('superdesk.core.menu', [ $timeout(() => window.dispatchEvent(new Event('resize')), 500, false); }); - // full preview - - $scope.fullPreviewItems = []; - - $scope.closeFullPreview = () => { - $scope.fullPreviewItems = []; - }; - - const removeMultiPreviewEventListener = addInternalEventListener('openFullPreview', (event) => { - $scope.fullPreviewItems = event.detail; - $scope.$apply(); - }); - $scope.itemsForExport = null; /** @@ -100,7 +87,6 @@ angular.module('superdesk.core.menu', [ // remove listeners $scope.$on('$destroy', () => { - removeMultiPreviewEventListener(); removeOpenExportListener(); }); } diff --git a/scripts/core/menu/views/superdesk-view.html b/scripts/core/menu/views/superdesk-view.html index b4e2c0a897..31b4742498 100644 --- a/scripts/core/menu/views/superdesk-view.html +++ b/scripts/core/menu/views/superdesk-view.html @@ -27,14 +27,6 @@
- -
-
diff --git a/styles/sass/layouts.scss b/styles/sass/layouts.scss index eef2e6e2fa..cd97cb80e4 100644 --- a/styles/sass/layouts.scss +++ b/styles/sass/layouts.scss @@ -1432,86 +1432,6 @@ $flex-grid-box-bg: white; } } -// PREPARE MODAL FOR PRINT -body.prepare-print { - margin-left: 1.5cm; - margin-right: 1.5cm; - - background: none! important; - overflow: visible !important; - color: black; - > * { - display: none !important; - } - > .modal--fullscreen { - position: static !important; - display: block !important; - width: 100%; - margin: 0; padding: 0; - background: none; - .modal-dialog { - display: block !important; - } - .association { - margin-bottom: 16px !important; - } - p { - font-size: 9pt !important; - line-height: 140% !important; - margin-bottom: 12px !important; - } - h2 { - font-size: 13pt !important; - } - h3 { - font-size: 10pt !important; - } - .headline { - font-size: 16pt !important; - margin-bottom: 16px !important; - } - .modal__body { - display: block !important; - padding: 0 !important; - } - .modal-content { - display: block !important; - > * { - display: none !important; - } - .byline { - font-size: 10pt !important; - margin-bottom: 20px !important; - } - > .modal-body { - display: block !important; - padding: 0 !important; - } - .preview-content { - max-width: 100% !important; - } - .metadata { - margin-top: 0 !important; - margin-bottom: 15px !important; - > div { - margin-bottom: 0 !important; - } - .preview-label label { - color: black; - } - .preview-data span { - border-radius: 0 !important; - background-color: transparent !important; - border-right: 1px solid black; - &:last-of-type { - border-right: 0 !important; - } - } - } - } - } -} - .loading-overlay { position: absolute; top: 0; From a82d4aa61a5808a74f61457ea4aa6250af4facb7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 4 Nov 2021 12:01:37 +0100 Subject: [PATCH 0119/1070] use full preview from monitor widget; remove unused code --- .../directives/ItemPreviewContainer.ts | 43 -------- scripts/apps/archive/directives/MediaView.ts | 102 ------------------ scripts/apps/archive/directives/SingleItem.ts | 10 -- scripts/apps/archive/directives/index.ts | 3 - scripts/apps/archive/index.tsx | 3 - scripts/apps/archive/tests/archive.spec.ts | 22 ---- scripts/apps/archive/views/media-view.html | 63 ----------- .../archive/views/single-item-preview.html | 30 ------ .../controllers/ProductionTestController.ts | 10 +- .../views/production-test-view.html | 1 - .../user-activity/components/Group.tsx | 7 -- .../controllers/LegalArchiveController.ts | 8 -- .../legal-archive/views/legal_archive.html | 1 - .../apps/monitoring/directives/WidgetGroup.ts | 1 - scripts/apps/search/components/WidgetItem.tsx | 6 +- .../apps/search/components/WidgetItemList.tsx | 2 - scripts/apps/search/directives/ItemPreview.ts | 1 - .../apps/search/directives/SearchResults.ts | 8 -- scripts/core/menu/views/superdesk-view.html | 2 - 19 files changed, 4 insertions(+), 319 deletions(-) delete mode 100644 scripts/apps/archive/directives/ItemPreviewContainer.ts delete mode 100644 scripts/apps/archive/directives/MediaView.ts delete mode 100644 scripts/apps/archive/directives/SingleItem.ts delete mode 100644 scripts/apps/archive/views/media-view.html delete mode 100644 scripts/apps/archive/views/single-item-preview.html diff --git a/scripts/apps/archive/directives/ItemPreviewContainer.ts b/scripts/apps/archive/directives/ItemPreviewContainer.ts deleted file mode 100644 index 457cec4824..0000000000 --- a/scripts/apps/archive/directives/ItemPreviewContainer.ts +++ /dev/null @@ -1,43 +0,0 @@ -import {IArticle} from 'superdesk-api'; -import {dispatchCustomEvent} from 'core/get-superdesk-api-implementation'; - -let itemInPreviewMode: IArticle | null = null; - -export function ItemPreviewContainer() { - return { - template: '
', - scope: {}, - link: function(scope) { - scope.item = null; - - scope.$on('intent:preview:item', (event, intent) => { - if (itemInPreviewMode != null) { - dispatchCustomEvent('articlePreviewEnd', itemInPreviewMode); - - itemInPreviewMode = null; - } - - if (intent.data != null) { - itemInPreviewMode = intent.data; - - dispatchCustomEvent('articlePreviewStart', itemInPreviewMode); - } - - scope.item = intent.data; - }); - - /** - * Close lightbox - */ - scope.close = function() { - scope.item = null; - - if (itemInPreviewMode != null) { - dispatchCustomEvent('articlePreviewEnd', itemInPreviewMode); - - itemInPreviewMode = null; - } - }; - }, - }; -} diff --git a/scripts/apps/archive/directives/MediaView.ts b/scripts/apps/archive/directives/MediaView.ts deleted file mode 100644 index e4a6c04c9b..0000000000 --- a/scripts/apps/archive/directives/MediaView.ts +++ /dev/null @@ -1,102 +0,0 @@ -import _ from 'lodash'; - -MediaView.$inject = ['keyboardManager', 'packages']; - -export function MediaView(keyboardManager, packages) { - return { - templateUrl: 'scripts/apps/archive/views/media-view.html', - scope: { - items: '=', - item: '=', - close: '&', - }, - link: function(scope, elem) { - var packageStack = []; - - scope.singleItem = null; - scope.packageItem = null; - - scope.prevEnabled = true; - scope.nextEnabled = true; - - var getIndex = function(item) { - return _.findIndex(scope.items, {_id: item._id}); - }; - - var setItem = function(item) { - resetStack(); - scope.item = item; - scope.openItem(item); - var index = getIndex(scope.item); - - scope.prevEnabled = index > -1 && !!scope.items[index - 1]; - scope.nextEnabled = index > -1 && !!scope.items[index + 1]; - }; - - scope.prev = function() { - var index = getIndex(scope.item); - - if (index > 0) { - setItem(scope.items[index - 1]); - } - }; - scope.next = function() { - var index = getIndex(scope.item); - - if (index !== -1 && index < scope.items.length - 1) { - setItem(scope.items[index + 1]); - } - }; - - keyboardManager.push('left', scope.prev); - keyboardManager.push('right', scope.next); - keyboardManager.bind('esc', () => { - scope.close(); - }, {global: true}); - scope.$on('$destroy', () => { - keyboardManager.pop('left'); - keyboardManager.pop('right'); - keyboardManager.unbind('esc'); - }); - - scope.setPackageSingle = function(packageItem) { - packages.fetchItem(packageItem).then((item) => { - scope.openItem(item); - }); - }; - - scope.openItem = function(item) { - if (item.type === 'composite') { - packageStack.push(item); - pickPackageItem(); - } - scope.setSingleItem(item); - }; - - scope.setSingleItem = function(item) { - scope.singleItem = item; - }; - - scope.nested = function() { - return packageStack.length > 1; - }; - - scope.previousPackage = function() { - _.remove(packageStack, _.last(packageStack)); - pickPackageItem(); - scope.setSingleItem(scope.packageItem); - }; - - var pickPackageItem = function() { - scope.packageItem = _.last(packageStack) || null; - }; - - var resetStack = function() { - packageStack = []; - scope.packageItem = null; - }; - - setItem(scope.item); - }, - }; -} diff --git a/scripts/apps/archive/directives/SingleItem.ts b/scripts/apps/archive/directives/SingleItem.ts deleted file mode 100644 index e855d7a14e..0000000000 --- a/scripts/apps/archive/directives/SingleItem.ts +++ /dev/null @@ -1,10 +0,0 @@ -export function SingleItem() { - return { - templateUrl: 'scripts/apps/archive/views/single-item-preview.html', - scope: { - item: '=', - contents: '=', - setitem: '&', - }, - }; -} diff --git a/scripts/apps/archive/directives/index.ts b/scripts/apps/archive/directives/index.ts index 11e5cdf56d..4fab563ca0 100644 --- a/scripts/apps/archive/directives/index.ts +++ b/scripts/apps/archive/directives/index.ts @@ -2,12 +2,9 @@ export {ItemLock} from './ItemLock'; export {ItemState} from './ItemState'; export {InlineMeta} from './InlineMeta'; export {MediaPreview, MediaPreviewWidget} from './MediaPreview'; -export {ItemPreviewContainer} from './ItemPreviewContainer'; -export {MediaView} from './MediaView'; export {MediaMetadata} from './MediaMetadata'; export {FetchedDesks} from './FetchedDesks'; export {MetaIngest} from './MetaIngest'; -export {SingleItem} from './SingleItem'; export {DraggableItem} from './DraggableItem'; export {ItemCrops} from './ItemCrops'; export {ItemRendition} from './ItemRendition'; diff --git a/scripts/apps/archive/index.tsx b/scripts/apps/archive/index.tsx index a8193cc09a..72870f9552 100644 --- a/scripts/apps/archive/index.tsx +++ b/scripts/apps/archive/index.tsx @@ -37,13 +37,10 @@ angular.module('superdesk.apps.archive.directives', [ .directive('sdInlineMeta', directive.InlineMeta) .directive('sdMediaPreview', directive.MediaPreview) .directive('sdMediaPreviewWidget', directive.MediaPreviewWidget) - .directive('sdItemPreviewContainer', directive.ItemPreviewContainer) - .directive('sdMediaView', directive.MediaView) .directive('sdMediaMetadata', directive.MediaMetadata) .component('sdRelatedView', reactToAngular1(RelatedView, ['relatedItems'], [])) .directive('sdFetchedDesks', directive.FetchedDesks) .directive('sdMetaIngest', directive.MetaIngest) - .directive('sdSingleItem', directive.SingleItem) .directive('sdDraggableItem', directive.DraggableItem) .directive('sdItemCrops', directive.ItemCrops) .directive('sdItemRendition', directive.ItemRendition) diff --git a/scripts/apps/archive/tests/archive.spec.ts b/scripts/apps/archive/tests/archive.spec.ts index a9eadbab42..f2ab43865d 100644 --- a/scripts/apps/archive/tests/archive.spec.ts +++ b/scripts/apps/archive/tests/archive.spec.ts @@ -256,28 +256,6 @@ describe('content', () => { })); }); - describe('item preview container', () => { - it('can handle preview:item intent', inject(($rootScope, $compile, superdesk) => { - var scope = $rootScope.$new(); - var elem = $compile('
')(scope); - - scope.$digest(); - - var iscope = elem.isolateScope(); - - expect(iscope.item).toBe(null); - - scope.$apply(() => { - superdesk.intent('preview', 'item', item); - }); - - expect(iscope.item).toBe(item); - - iscope.close(); - expect(iscope.item).toBe(null); - })); - }); - describe('item preview header', () => { it('on toggle sets the header state in local storage', inject(($rootScope, $compile, storage) => { storage.clear(); diff --git a/scripts/apps/archive/views/media-view.html b/scripts/apps/archive/views/media-view.html deleted file mode 100644 index 5d8853c469..0000000000 --- a/scripts/apps/archive/views/media-view.html +++ /dev/null @@ -1,63 +0,0 @@ -
- - - -
-
- -
-
- - - - - - -
{{ packageItem.headline }}
-
-
-
    -
    -
-
-
- - - -
- -
- - - - -
- - -
-
-
{{ singleItem.headline }}
- - {{ 'Created:'|translate }} {{ singleItem.firstcreated|date:'medium' }} - {{ 'Modified:'|translate }} {{ singleItem.versioncreated|date:'medium' }} - - - -
- -
- -
-
-
-
-
-
-
-
-
-
diff --git a/scripts/apps/archive/views/single-item-preview.html b/scripts/apps/archive/views/single-item-preview.html deleted file mode 100644 index 77d246aec9..0000000000 --- a/scripts/apps/archive/views/single-item-preview.html +++ /dev/null @@ -1,30 +0,0 @@ -
- - -
- -
- - -
-
-
- - -
-
-
{{ item.headline }}
-
- {{ item.slugline || item.headline }} -
-
-
-
- - -
-
-
- -
{{ item.headline }}
-
diff --git a/scripts/apps/content-filters/controllers/ProductionTestController.ts b/scripts/apps/content-filters/controllers/ProductionTestController.ts index d32109cbe4..4bf652e366 100644 --- a/scripts/apps/content-filters/controllers/ProductionTestController.ts +++ b/scripts/apps/content-filters/controllers/ProductionTestController.ts @@ -38,15 +38,7 @@ export function ProductionTestController($scope, contentFilters, notify, $locati $scope.preview = function(Item) { $location.search('_id', Item ? Item._id : Item); }; - $scope.openView = function(item) { - $scope.openLightbox(item); - }; - $scope.openLightbox = function(item) { - $scope.selected.view = item; - }; - $scope.closeLightbox = function() { - $scope.selected.view = null; - }; + $scope.hideActions = function() { return true; }; diff --git a/scripts/apps/content-filters/views/production-test-view.html b/scripts/apps/content-filters/views/production-test-view.html index ccb56d4487..1f08bd3f74 100644 --- a/scripts/apps/content-filters/views/production-test-view.html +++ b/scripts/apps/content-filters/views/production-test-view.html @@ -66,4 +66,3 @@
-
diff --git a/scripts/apps/dashboard/user-activity/components/Group.tsx b/scripts/apps/dashboard/user-activity/components/Group.tsx index c04f6f2ec2..bc7a652176 100644 --- a/scripts/apps/dashboard/user-activity/components/Group.tsx +++ b/scripts/apps/dashboard/user-activity/components/Group.tsx @@ -55,13 +55,6 @@ export class GroupComponent extends React.Component { empty: gettext('No results for this user'), }} canEdit={true} - preview={(item: IArticle) => { - this.services.superdesk.intent( - 'preview', - 'item', - item, - ); - }} select={(item: IArticle) => { this.services.superdesk.intent( 'preview', diff --git a/scripts/apps/legal-archive/controllers/LegalArchiveController.ts b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts index 9db117c150..d2ec03f07a 100644 --- a/scripts/apps/legal-archive/controllers/LegalArchiveController.ts +++ b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts @@ -44,14 +44,6 @@ export function LegalArchiveController($scope, $location, legal, preferencesServ } }; - $scope.openLightbox = function() { - $scope.selected.view = $scope.selected.preview; - }; - - $scope.closeLightbox = function() { - $scope.selected.view = null; - }; - $scope.clear = function() { legal.criteria = $scope.criteria = {}; $scope.search(); diff --git a/scripts/apps/legal-archive/views/legal_archive.html b/scripts/apps/legal-archive/views/legal_archive.html index 8b309f29b4..291096f258 100644 --- a/scripts/apps/legal-archive/views/legal_archive.html +++ b/scripts/apps/legal-archive/views/legal_archive.html @@ -141,4 +141,3 @@
-
diff --git a/scripts/apps/monitoring/directives/WidgetGroup.ts b/scripts/apps/monitoring/directives/WidgetGroup.ts index a019525c63..c153228a81 100644 --- a/scripts/apps/monitoring/directives/WidgetGroup.ts +++ b/scripts/apps/monitoring/directives/WidgetGroup.ts @@ -430,7 +430,6 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q, canEdit: scope.canEdit, customMonitoringWidget: $rootScope.config.features.customMonitoringWidget, svc: services, - preview: scope.preview, select: scope.select, edit: scope.edit, }; diff --git a/scripts/apps/search/components/WidgetItem.tsx b/scripts/apps/search/components/WidgetItem.tsx index c5ab46c7ed..ff58acf895 100644 --- a/scripts/apps/search/components/WidgetItem.tsx +++ b/scripts/apps/search/components/WidgetItem.tsx @@ -5,13 +5,13 @@ import {gettext} from 'core/utils'; import {IArticle} from 'superdesk-api'; import {querySelectorParent} from 'core/helpers/dom/querySelectorParent'; import ng from 'core/services/ng'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; interface IProps { - item?: any; + item?: IArticle; selected?: boolean; canEdit?: boolean; customMonitoringWidget?: boolean; - preview: (item: IArticle) => void; select: (item: IArticle) => void; edit: (item: IArticle) => void; } @@ -35,7 +35,7 @@ export class WidgetItem extends React.Component { } preview() { - this.props.preview(this.item); + previewItems([this.item]); } select(e) { diff --git a/scripts/apps/search/components/WidgetItemList.tsx b/scripts/apps/search/components/WidgetItemList.tsx index 708a311593..265b39c20a 100644 --- a/scripts/apps/search/components/WidgetItemList.tsx +++ b/scripts/apps/search/components/WidgetItemList.tsx @@ -7,7 +7,6 @@ import {generateTrackByIdentifier} from '../services/SearchService'; interface IProps { canEdit?: boolean; customMonitoringWidget?: boolean; - preview: (item: IArticle) => void; select: (item: IArticle) => void; edit: (item: IArticle) => void; customUIMessages?: { @@ -59,7 +58,6 @@ export class WidgetItemList extends React.Component { customMonitoringWidget={ this.props.customMonitoringWidget } - preview={this.props.preview} select={this.props.select} edit={this.props.edit} /> diff --git a/scripts/apps/search/directives/ItemPreview.ts b/scripts/apps/search/directives/ItemPreview.ts index fa2f0aa0f0..c616748f0f 100644 --- a/scripts/apps/search/directives/ItemPreview.ts +++ b/scripts/apps/search/directives/ItemPreview.ts @@ -41,7 +41,6 @@ export function ItemPreview(asset, storage, desks, _, familyService, privileges) scope: { item: '=', close: '&', - openLightbox: '=', openSingleItem: '=', hideActionsMenu: '=', showHistoryTab: '=', diff --git a/scripts/apps/search/directives/SearchResults.ts b/scripts/apps/search/directives/SearchResults.ts index e24ef7f8bd..d3b8a0e4ed 100644 --- a/scripts/apps/search/directives/SearchResults.ts +++ b/scripts/apps/search/directives/SearchResults.ts @@ -481,14 +481,6 @@ export function SearchResults( $location.search('_id', item ? item._id : null); } - scope.openLightbox = function openLightbox() { - scope.selected.view = scope.selected.preview; - }; - - scope.closeLightbox = function closeLightbox() { - scope.selected.view = null; - }; - scope.openSingleItem = function(packageItem) { packages.fetchItem(packageItem).then((item) => { scope.selected.view = item; diff --git a/scripts/core/menu/views/superdesk-view.html b/scripts/core/menu/views/superdesk-view.html index 31b4742498..06bde18bf4 100644 --- a/scripts/core/menu/views/superdesk-view.html +++ b/scripts/core/menu/views/superdesk-view.html @@ -24,14 +24,12 @@
-

-
From 82a0350d67485719ccaea8dea0c74e92f34302cc Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 4 Nov 2021 12:43:52 +0100 Subject: [PATCH 0120/1070] enable full preview --- scripts/apps/authoring-react/authoring-react.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index e435d584cc..26d32d52fb 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -4,6 +4,7 @@ import {Button, Loader} from 'superdesk-ui-framework'; import {gettext} from 'core/utils'; import {IContentProfileV2, authoringStorage} from './data-layer'; import {AuthoringSection} from './authoring-section'; +import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; interface IProps { itemId: IArticle['_id']; @@ -132,6 +133,7 @@ export class AuthoringReact extends React.PureComponent {
From 5853f7aaed9bd3d864436f761b4908cf62292e5d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 4 Nov 2021 15:06:52 +0100 Subject: [PATCH 0121/1070] display custom fields --- .../authoring-react/authoring-section.tsx | 31 +++++--- scripts/apps/authoring-react/data-layer.ts | 79 ++++++++++++++----- 2 files changed, 78 insertions(+), 32 deletions(-) diff --git a/scripts/apps/authoring-react/authoring-section.tsx b/scripts/apps/authoring-react/authoring-section.tsx index a6bb3b3fb6..5cec4d6684 100644 --- a/scripts/apps/authoring-react/authoring-section.tsx +++ b/scripts/apps/authoring-react/authoring-section.tsx @@ -3,6 +3,7 @@ import {IFieldsV2} from './data-layer'; import {IArticle} from 'superdesk-api'; import {FieldText} from './fields/field-text'; import {assertNever} from 'core/helpers/typescript-helpers'; +import {getField} from 'apps/fields'; interface IProps { fields: IFieldsV2; @@ -19,16 +20,13 @@ export class AuthoringSection extends React.PureComponent { { fields.map((field) => (
-

{field.id}

+

{field.name}

{(() => { - const {type} = field; - - switch (type) { - case 'text': + if (field.type === 'text') { return ( { this.props.onChange({ ...item, @@ -37,21 +35,28 @@ export class AuthoringSection extends React.PureComponent { }} /> ); + } else if (field.type === 'from-extension') { + const FieldType = getField(field.extension_field_type); - case 'dropdown': return ( - { + { this.props.onChange({ ...item, - [field.id]: valueChanged, + extra: { + ...(item.extra ?? {}), + [field.id]: valueChanged, + }, }); }} + readOnly={false} + config={field.extension_field_config} /> ); - default: - return assertNever(type); + } else { + return assertNever(field); } })()}
diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts index 6b62934707..67d924b256 100644 --- a/scripts/apps/authoring-react/data-layer.ts +++ b/scripts/apps/authoring-react/data-layer.ts @@ -6,20 +6,24 @@ import {dataApi} from 'core/helpers/CrudManager'; import {authoringApiCommon} from 'apps/authoring-bridge/authoring-api-common'; import {generatePatch} from 'core/patch'; import {appConfig} from 'appConfig'; +import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId'; interface IFieldBase { id: string; + name: string; } interface IFieldText extends IFieldBase { type: 'text'; } -interface IFieldDropdown extends IFieldBase { - type: 'dropdown'; +interface IFieldFromExtension extends IFieldBase { + type: 'from-extension'; + extension_field_type: string; + extension_field_config: any; } -export type IAuthoringFieldV2 = IFieldText | IFieldDropdown; +export type IAuthoringFieldV2 = IFieldText | IFieldFromExtension; export type IFieldsV2 = OrderedMap; @@ -38,30 +42,67 @@ function getContentProfile(item: IArticle): Promise { let fakeScope: Partial = {}; - /** - * !!! The use of `setupAuthoring` outside of angular is experimental. - * I'm only using for getting some test data on the screen. - */ - return ng.get('content').setupAuthoring(item.profile, fakeScope, item).then(() => { - const {editor} = fakeScope; - const editorOrdered = + return Promise.all([ + getLabelNameResolver(), + ng.get('content').setupAuthoring(item.profile, fakeScope, item), + ]).then((res) => { + const [getLabelForFieldId] = res; + + const {editor, fields} = fakeScope; + + const fieldsOrdered = Object.keys(editor) - .map((key) => ({...editor[key], name: key})) - .sort((a, b) => a.order - b.order); + .map((key) => { + const result: {fieldId: string, editorItem: any} = + { + fieldId: key, + editorItem: editor[key], + }; + + return result; + }) + .sort((a, b) => a.editorItem.order - b.editorItem.order); let headerFields: IFieldsV2 = OrderedMap(); let contentFields: IFieldsV2 = OrderedMap(); - for (const editorItem of editorOrdered) { - const field: IAuthoringFieldV2 = { - id: editorItem.name, - type: 'text', - }; + for (const {fieldId, editorItem} of fieldsOrdered) { + const field = fields.find(({_id}) => _id === fieldId); + + const fieldV2: IAuthoringFieldV2 = (() => { + if (field == null) { + const result: IAuthoringFieldV2 = { + id: fieldId, + name: getLabelForFieldId(fieldId), + type: 'text', + }; + + return result; + } else if (field.field_type === 'custom') { + const result: IAuthoringFieldV2 = { + id: fieldId, + name: getLabelForFieldId(fieldId), + type: 'from-extension', + extension_field_type: field.custom_field_type, + extension_field_config: field.custom_field_config, + }; + + return result; + } else { + const result: IAuthoringFieldV2 = { + id: fieldId, + name: getLabelForFieldId(fieldId), + type: 'text', + }; + + return result; + } + })(); if (editorItem.section === 'header') { - headerFields = headerFields.set(field.id, field); + headerFields = headerFields.set(fieldV2.id, fieldV2); } else if (editorItem.section === 'content') { - contentFields = contentFields.set(field.id, field); + contentFields = contentFields.set(fieldV2.id, fieldV2); } else { throw new Error('invalid section'); } From b7ea2b91cfac53be1266069488739284dfb6442a Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 8 Nov 2021 13:04:07 +0100 Subject: [PATCH 0122/1070] close authoring - SDESK-6301 --- .../authoring-bridge/authoring-api-common.ts | 38 ++++++ .../apps/authoring-react/authoring-react.tsx | 11 +- scripts/apps/authoring-react/data-layer.ts | 19 ++- .../directives/AuthoringDirective.ts | 20 ++- .../authoring/services/AuthoringService.ts | 46 +++---- .../apps/authoring/tests/authoring.spec.ts | 101 +++------------ .../components/prompt-for-unsaved-changes.tsx | 117 +++++++++++++----- 7 files changed, 189 insertions(+), 163 deletions(-) diff --git a/scripts/apps/authoring-bridge/authoring-api-common.ts b/scripts/apps/authoring-bridge/authoring-api-common.ts index 1ef719c9b3..4805d09276 100644 --- a/scripts/apps/authoring-bridge/authoring-api-common.ts +++ b/scripts/apps/authoring-bridge/authoring-api-common.ts @@ -1,9 +1,21 @@ import {IArticle} from 'superdesk-api'; import {runBeforeUpdateMiddlware, runAfterUpdateEvent} from 'apps/authoring/authoring/services/AuthoringService'; +import {showUnsavedChangesPrompt, IUnsavedChangesActionWithSaving} from 'core/ui/components/prompt-for-unsaved-changes'; +import {assertNever} from 'core/helpers/typescript-helpers'; +import {ITEM_STATE} from 'apps/archive/constants'; +import {isLockedInCurrentSession} from 'core/get-superdesk-api-implementation'; export interface IAuthoringApiCommon { saveBefore(current: IArticle, original: IArticle): Promise; saveAfter(current: IArticle, original: IArticle): void; + closeAuthoring( + original: IArticle, + hasUnsavedChanges: boolean, + save: () => Promise, + unlock: () => Promise, + cancelAutoSave: () => Promise, + doClose: () => void, + ): Promise; } /** @@ -16,4 +28,30 @@ export const authoringApiCommon: IAuthoringApiCommon = { saveAfter: (current, original) => { runAfterUpdateEvent(original, current); }, + closeAuthoring: (original: IArticle, hasUnsavedChanges, save, unlock, cancelAutoSave, doClose) => { + if (!isLockedInCurrentSession(original)) { + return Promise.resolve().then(() => doClose()); + } + + if (hasUnsavedChanges && (original.state !== ITEM_STATE.PUBLISHED && original.state !== ITEM_STATE.CORRECTED)) { + return showUnsavedChangesPrompt(hasUnsavedChanges).then(({action, closePromptFn}) => { + const unlockAndClose = () => unlock().then(() => { + closePromptFn(); + doClose(); + }); + + if (action === IUnsavedChangesActionWithSaving.cancelAction) { + return closePromptFn(); + } else if (action === IUnsavedChangesActionWithSaving.discardChanges) { + return cancelAutoSave().then(() => unlockAndClose()); + } else if (action === IUnsavedChangesActionWithSaving.save) { + return save().then(() => unlockAndClose()); + } else { + assertNever(action); + } + }); + } else { + return unlock().then(() => doClose()); + } + }, }; diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index 26d32d52fb..618d7fcd03 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -140,8 +140,15 @@ export class AuthoringReact extends React.PureComponent { loading: true, }); - authoringStorage.unlockArticle(state.itemOriginal._id).then(() => { - this.props.onClose(); + authoringStorage.closeAuthoring( + state.itemWithChanges, + state.itemOriginal, + () => this.props.onClose(), + ).then(() => { + this.setState({ + ...state, + loading: false, + }); }); }} /> diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts index 67d924b256..bbc589e331 100644 --- a/scripts/apps/authoring-react/data-layer.ts +++ b/scripts/apps/authoring-react/data-layer.ts @@ -121,7 +121,7 @@ function getContentProfile(item: IArticle): Promise { interface IAuthoringStorage { getArticle(id: string): Promise; saveArticle(current: IArticle, original: IArticle): Promise; - unlockArticle(id: string): Promise; + closeAuthoring(current: IArticle, original: IArticle, doClose: () => void): Promise; getContentProfile(item: IArticle): Promise; } @@ -156,11 +156,24 @@ export const authoringStorage: IAuthoringStorage = { }); }, getContentProfile, - unlockArticle: (id) => { - return httpRequestJsonLocal({ + closeAuthoring: (current, original, doClose) => { + const diff = generatePatch(original, current); + const hasUnsavedChanges = Object.keys(diff).length > 0; + const cancelAutoSave = () => Promise.resolve(); // no auto-save yet + + const unlockArticle = (id: string) => httpRequestJsonLocal({ method: 'POST', payload: {}, path: `/archive/${id}/unlock`, }); + + return authoringApiCommon.closeAuthoring( + original, + hasUnsavedChanges, + () => authoringStorage.saveArticle(current, original).then(() => undefined), + () => unlockArticle(original._id), + cancelAutoSave, + doClose, + ); }, }; diff --git a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts index fdb6c698cd..a8ebbb92fa 100644 --- a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts +++ b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts @@ -810,10 +810,15 @@ export function AuthoringDirective( _closing = true; // returned promise used by superdesk-fi - return authoring.close($scope.item, $scope.origItem, $scope.save_enabled()).then(() => { - authoringWorkspace.close(true); - $rootScope.$broadcast('item:close', $scope.origItem._id); - }); + return authoring.close( + $scope.item, + $scope.origItem, + $scope.save_enabled(), + () => { + authoringWorkspace.close(true); + $rootScope.$broadcast('item:close', $scope.origItem._id); + }, + ); }; /** @@ -832,13 +837,6 @@ export function AuthoringDirective( authoringWorkspace.close(true); }; - $scope.closeOpenNew = function(createFunction, paramValue) { - _closing = true; - authoring.close($scope.item, $scope.origItem, $scope.dirty, true).then(() => { - createFunction(paramValue); - }); - }; - /** * Called by the sendItem directive before send. * If the $scope is dirty then upon confirmation save the item and then unlock the item. diff --git a/scripts/apps/authoring/authoring/services/AuthoringService.ts b/scripts/apps/authoring/authoring/services/AuthoringService.ts index 8df29f9932..0fe410a420 100644 --- a/scripts/apps/authoring/authoring/services/AuthoringService.ts +++ b/scripts/apps/authoring/authoring/services/AuthoringService.ts @@ -139,8 +139,8 @@ AuthoringService.$inject = [ '$injector', 'moment', 'familyService', - 'modal', 'archiveService', + '$rootScope', ]; export function AuthoringService( @@ -158,8 +158,8 @@ export function AuthoringService( $injector, moment, familyService, - modal, archiveService, + $rootScope, ) { var self = this; @@ -330,35 +330,21 @@ export function AuthoringService( diff: Readonly>, orig: Readonly, isDirty: boolean, - closeItem: boolean, + doClose: () => void, ): Promise { - var promise = $q.when(); - - if (isEditable(diff)) { - if (isDirty) { - if (!_.includes(['published', 'corrected'], orig.state)) { - promise = confirm.confirm() - .then(angular.bind(this, function save() { - return this.save(orig, diff); - }), () => // ignore saving - $q.when('ignore')); - } else { - promise = $q.when('ignore'); - } - } - - promise = promise.then(function unlock(cancelType) { - if (cancelType && cancelType === 'ignore') { - autosave.drop(orig); - } - - if (!closeItem) { - return lock.unlock(diff); - } - }); - } - - return promise; + return authoringApiCommon.closeAuthoring( + orig, + isDirty, + () => this.save(orig, diff), + () => lock.unlock(diff), + () => new Promise((resolve) => { + autosave.drop(orig); + resolve(); + }), + doClose, + ).then(() => { + $rootScope.$applyAsync(); // update angular UI + }); }; /** diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index 66f0c73ed9..40f003fedc 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -387,66 +387,35 @@ describe('authoring', () => { .toBe(true); })); - it('can close a read-only item', inject((authoring, confirm, lock, $rootScope) => { - var done = jasmine.createSpy('done'); + it('can close a read-only item', (done) => inject((authoring, confirm, lock, $rootScope) => { + const onClose = jasmine.createSpy('onClose1'); - authoring.close({}).then(done); + authoring.close({}, {}, true, onClose); $rootScope.$digest(); - expect(confirm.confirm).not.toHaveBeenCalled(); - expect(lock.unlock).not.toHaveBeenCalled(); - expect(done).toHaveBeenCalled(); + setTimeout(() => { + expect(confirm.confirm).not.toHaveBeenCalled(); + expect(lock.unlock).not.toHaveBeenCalled(); + expect(onClose).toHaveBeenCalled(); + done(); + }, 100); })); it('can unlock on close editable item without changes made', - inject((authoring, confirm, lock, $rootScope) => { - expect(authoring.isEditable(ITEM)).toBe(true); - authoring.close(ITEM, false); - $rootScope.$digest(); - expect(confirm.confirm).not.toHaveBeenCalled(); - expect(lock.unlock).toHaveBeenCalled(); - })); - - it('confirms if an item is dirty and saves', - inject((authoring, confirm, lock, $q, $rootScope) => { - var edit = Object.create(ITEM); - - edit.headline = 'test'; - - authoring.close(edit, ITEM, true); - $rootScope.$digest(); - - expect(confirm.confirm).toHaveBeenCalled(); - expect(lock.unlock).not.toHaveBeenCalled(); + inject((authoring, confirm, lock, $rootScope, session) => { + const itemLocked = { + ...ITEM, + lock_user: session.identity._id, + lock_session: session.sessionId, + }; - spyOn(authoring, 'save').and.returnValue($q.when()); - confirmDefer.resolve(); + expect(authoring.isEditable(itemLocked)).toBe(true); + authoring.close(itemLocked, itemLocked, false); $rootScope.$digest(); - - expect(authoring.save).toHaveBeenCalledWith(ITEM, edit); + expect(confirm.confirm).not.toHaveBeenCalled(); expect(lock.unlock).toHaveBeenCalled(); })); - it('confirms if an item is dirty on opening new or existing item and not unlocking on save', - inject((authoring, confirm, lock, $q, $rootScope) => { - var edit = Object.create(ITEM); - - edit.headline = 'test'; - - authoring.close(edit, ITEM, true, true); - $rootScope.$digest(); - - expect(confirm.confirm).toHaveBeenCalled(); - expect(lock.unlock).not.toHaveBeenCalled(); - - spyOn(authoring, 'save').and.returnValue($q.when()); - confirmDefer.resolve(); - $rootScope.$digest(); - - expect(authoring.save).toHaveBeenCalledWith(ITEM, edit); - expect(lock.unlock).not.toHaveBeenCalled(); - })); - it('can unlock an item', inject((authoring, session, confirm, autosave) => { var item = {lock_user: session.identity._id, lock_session: session.sessionId}; @@ -516,40 +485,6 @@ describe('authoring', () => { expect(api.save).toHaveBeenCalledWith('archive', {}, edit); })); - it('close the published dirty item without confirmation', - inject((authoring, api, confirm, lock, autosave, $q, $rootScope) => { - var publishedItem = Object.create(ITEM); - - publishedItem.state = 'published'; - var edit = Object.create(publishedItem); - - edit.headline = 'test'; - spyOn(authoring, 'isEditable').and.returnValue(true); - spyOn(autosave, 'drop').and.returnValue($q.when({})); - authoring.close(edit, publishedItem, true, false); - $rootScope.$digest(); - expect(confirm.confirm).not.toHaveBeenCalled(); - expect(lock.unlock).toHaveBeenCalled(); - expect(autosave.drop).toHaveBeenCalled(); - })); - - it('close the corrected dirty item without confirmation', - inject((authoring, api, confirm, lock, autosave, $q, $rootScope) => { - var publishedItem = Object.create(ITEM); - - publishedItem.state = 'corrected'; - var edit = Object.create(publishedItem); - - edit.headline = 'test'; - spyOn(authoring, 'isEditable').and.returnValue(true); - spyOn(autosave, 'drop').and.returnValue($q.when({})); - authoring.close(edit, publishedItem, true, false); - $rootScope.$digest(); - expect(confirm.confirm).not.toHaveBeenCalled(); - expect(lock.unlock).toHaveBeenCalled(); - expect(autosave.drop).toHaveBeenCalled(); - })); - it('can validate schedule', inject((authoring) => { var errors = authoring.validateSchedule('2010-10-10', '08:10:10', '2010-10-10T08:10:10', 'Europe/Prague'); diff --git a/scripts/core/ui/components/prompt-for-unsaved-changes.tsx b/scripts/core/ui/components/prompt-for-unsaved-changes.tsx index 291e0f5992..69a3130ba3 100644 --- a/scripts/core/ui/components/prompt-for-unsaved-changes.tsx +++ b/scripts/core/ui/components/prompt-for-unsaved-changes.tsx @@ -7,46 +7,95 @@ export enum IUnsavedChangesAction { cancelAction = 'cancelAction', } -interface IResult { - action: IUnsavedChangesAction; +export enum IUnsavedChangesActionWithSaving { + discardChanges = 'discardChanges', + save = 'save', + cancelAction = 'cancelAction', +} + +interface IResult { + action: T; closePromptFn: () => void; } -export function showUnsavedChangesPrompt(): Promise { +// overloads +export function showUnsavedChangesPrompt(itemOpen: true): Promise>; +export function showUnsavedChangesPrompt(): Promise>; + +export function showUnsavedChangesPrompt( + itemOpen?: boolean, // if not open, instead of option to save item, it will show an option to open it first +) { return new Promise((resolve) => { - showOptionsModal( - gettext('Save changes?'), - gettext('There are some unsaved changes, go to the article to save changes?'), - [ - { - label: gettext('Ignore'), - onSelect: (closePromptFn) => { - resolve({ - action: IUnsavedChangesAction.discardChanges, - closePromptFn, - }); + if (itemOpen === true) { + showOptionsModal( + gettext('Save changes?'), + gettext('There are some unsaved changes, save it now?'), + [ + { + label: gettext('Ignore'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesActionWithSaving.discardChanges, + closePromptFn, + }); + }, + }, + { + label: gettext('Cancel'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesActionWithSaving.cancelAction, + closePromptFn, + }); + }, + }, + { + label: gettext('Save'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesActionWithSaving.save, + closePromptFn, + }); + }, + highlightOption: true, + }, + ], + ); + } else { + showOptionsModal( + gettext('Save changes?'), + gettext('There are some unsaved changes, go to the article to save changes?'), + [ + { + label: gettext('Ignore'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesAction.discardChanges, + closePromptFn, + }); + }, }, - }, - { - label: gettext('Cancel'), - onSelect: (closePromptFn) => { - resolve({ - action: IUnsavedChangesAction.cancelAction, - closePromptFn, - }); + { + label: gettext('Cancel'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesAction.cancelAction, + closePromptFn, + }); + }, }, - }, - { - label: gettext('Go-To'), - onSelect: (closePromptFn) => { - resolve({ - action: IUnsavedChangesAction.openItem, - closePromptFn, - }); + { + label: gettext('Go-To'), + onSelect: (closePromptFn) => { + resolve({ + action: IUnsavedChangesAction.openItem, + closePromptFn, + }); + }, + highlightOption: true, }, - highlightOption: true, - }, - ], - ); + ], + ); + } }); } From d1b7d196ff75fc7da3d77a25be86e9b3a4747b9b Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 8 Nov 2021 17:37:53 +0100 Subject: [PATCH 0123/1070] test authoring UI components from UI framework --- scripts/appConfig.ts | 3 +- .../apps/authoring-react/authoring-react.tsx | 10 + .../ui-framework-authoring-test.tsx | 389 ++++++++++++++++++ 3 files changed, 401 insertions(+), 1 deletion(-) create mode 100644 scripts/apps/authoring-react/ui-framework-authoring-test.tsx diff --git a/scripts/appConfig.ts b/scripts/appConfig.ts index 7628baf3e8..6f27baa5fd 100644 --- a/scripts/appConfig.ts +++ b/scripts/appConfig.ts @@ -38,6 +38,7 @@ export const debugInfo = { }; // -export const authoringReactViewEnabled = false; +export const authoringReactViewEnabled = true; +export const uiFrameworkAuthoringPanelTest = true; export const extensions: IExtensions = {}; diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx index 618d7fcd03..bf261222ae 100644 --- a/scripts/apps/authoring-react/authoring-react.tsx +++ b/scripts/apps/authoring-react/authoring-react.tsx @@ -5,6 +5,8 @@ import {gettext} from 'core/utils'; import {IContentProfileV2, authoringStorage} from './data-layer'; import {AuthoringSection} from './authoring-section'; import {previewItems} from 'apps/authoring/preview/fullPreviewMultiple'; +import {EditorTest} from './ui-framework-authoring-test'; +import {uiFrameworkAuthoringPanelTest} from 'appConfig'; interface IProps { itemId: IArticle['_id']; @@ -119,6 +121,14 @@ export class AuthoringReact extends React.PureComponent { return null; } + if (uiFrameworkAuthoringPanelTest) { + return ( +
+ +
+ ); + } + return (
diff --git a/scripts/apps/authoring-react/ui-framework-authoring-test.tsx b/scripts/apps/authoring-react/ui-framework-authoring-test.tsx new file mode 100644 index 0000000000..d87c64869e --- /dev/null +++ b/scripts/apps/authoring-react/ui-framework-authoring-test.tsx @@ -0,0 +1,389 @@ +/* tslint:disable: max-line-length */ + +import * as React from 'react'; +import * as Layout from 'superdesk-ui-framework/react/components/Layouts'; +import * as Form from 'superdesk-ui-framework/react/components/Form'; +import * as Nav from 'superdesk-ui-framework/react/components/Navigation'; +import { + SubNav, + ButtonGroup, + Button, + Divider, + Dropdown, + NavButton, + Tooltip, + IconButton, + Input, + Select, + BoxedList, + BoxedListItem, + Icon, + BoxedListContentRow, + AvatarWrapper, + AvatarContentText, + EmptyState, + SimpleList, + SimpleListItem, + Switch, + Text, + Option, +} from 'superdesk-ui-framework/react'; + +interface IProps { + children?: React.ReactNode; +} + +interface IState { + theme: 'dark' | 'light' | string; + itemType: string; + dropDownState: string; + itemSelected1: boolean; + itemSelected2: boolean; + itemSelected3: boolean; + value1: boolean; + value2: boolean; + value3: boolean; + leftPanelOpen: boolean; + rightPanelOpen: boolean; + rightPanelPinned: boolean; + sideOverlayOpen: boolean; +} + +export class EditorTest extends React.Component { + constructor(props: IProps) { + super(props); + this.state = { + theme: 'light', + itemType: 'itemtype01', + dropDownState: '', + itemSelected1: false, + itemSelected2: false, + itemSelected3: false, + value1: false, + value2: false, + value3: false, + leftPanelOpen: false, + rightPanelOpen: false, + rightPanelPinned: false, + sideOverlayOpen: false, + }; + this.handleTheme = this.handleTheme.bind(this); + } + + handleTheme(newTheme: string) { + this.setState({ + theme: newTheme, + }); + } + + changeStatus(item: any, status: string) { + if (item.status.includes(status)) { + item.status.splice(item.status.indexOf(status), 1); + } else { + item.status.push(status); + } + } + + render() { + return ( + + +
- -
-

{gettext('Header')}

- - { - const nextState: IStateLoaded = { - ...state, - itemWithChanges: itemChanged, - }; - - this.setState(nextState); - }} - /> -
- -
-

{gettext('Content')}

- - { - const nextState: IStateLoaded = { - ...state, - itemWithChanges: itemChanged, - }; - - this.setState(nextState); - }} - /> -
- + + +
); } diff --git a/scripts/apps/authoring-react/ui-framework-authoring-test.tsx b/scripts/apps/authoring-react/ui-framework-authoring-test.tsx index d87c64869e..0904b96b9b 100644 --- a/scripts/apps/authoring-react/ui-framework-authoring-test.tsx +++ b/scripts/apps/authoring-react/ui-framework-authoring-test.tsx @@ -88,7 +88,7 @@ export class EditorTest extends React.Component { return ( +
- + false} /> false} /> false} /> @@ -265,7 +265,7 @@ export class EditorTest extends React.Component { Curabitur blandit tempus porttitor. ) : null} - + { {this.props.selectedDesk != null && this.isDeskMember(this.props.selectedDesk) ? ( - +
); diff --git a/scripts/apps/authoring-react/widget-header-component.tsx b/scripts/apps/authoring-react/widget-header-component.tsx new file mode 100644 index 0000000000..dabacd2784 --- /dev/null +++ b/scripts/apps/authoring-react/widget-header-component.tsx @@ -0,0 +1,45 @@ +import React from 'react'; +import * as Layout from 'superdesk-ui-framework/react/components/Layouts'; +import classNames from 'classnames'; +import {IWidgetIntegrationComponentProps} from 'apps/authoring/widgets/widgets'; + +export class WidgetHeaderComponent extends React.PureComponent { + render() { + const { + widget, + pinned, + pinWidget, + } = this.props; + + return ( + + + + { + this.props.editMode && ( + + {this.props.children} + + ) + } + + ); + } +} diff --git a/scripts/apps/authoring-react/widget-layout-component.tsx b/scripts/apps/authoring-react/widget-layout-component.tsx new file mode 100644 index 0000000000..1275c1a618 --- /dev/null +++ b/scripts/apps/authoring-react/widget-layout-component.tsx @@ -0,0 +1,26 @@ +import React from 'react'; +import * as Layout from 'superdesk-ui-framework/react/components/Layouts'; +import {IAuthoringWidgetLayoutProps} from 'superdesk-api'; + +/** + * Uses layout components from ui-framework. Is only meant to be used in {@link AuthoringReact} + */ +export class AuthoringWidgetLayoutComponent extends React.PureComponent { + render() { + const {header, body, footer} = this.props; + + return ( + + {header && {header}} + + + + {body} + + + + {footer && ({footer})} + + ); + } +} diff --git a/scripts/apps/authoring/widgets/WidgetHeaderComponent.tsx b/scripts/apps/authoring/widgets/WidgetHeaderComponent.tsx new file mode 100644 index 0000000000..b77a0675cc --- /dev/null +++ b/scripts/apps/authoring/widgets/WidgetHeaderComponent.tsx @@ -0,0 +1,51 @@ +import React from 'react'; +import classNames from 'classnames'; +import {IWidgetIntegrationComponentProps} from './widgets'; + +/** + * Uses markup/styles from angular-based authoring and is intended to be rendered there. + */ +export class WidgetHeaderComponent extends React.PureComponent { + render() { + const { + widget, + pinWidget, + } = this.props; + + return ( +
+
+ {this.props.widgetName} + + + +
+ + { + this.props.editMode && ( +
+ {this.props.children} +
+ ) + } +
+ ); + } +} diff --git a/scripts/apps/authoring/widgets/WidgetLayoutComponent.tsx b/scripts/apps/authoring/widgets/WidgetLayoutComponent.tsx new file mode 100644 index 0000000000..47d0eeedd0 --- /dev/null +++ b/scripts/apps/authoring/widgets/WidgetLayoutComponent.tsx @@ -0,0 +1,23 @@ +import React from 'react'; +import {IAuthoringWidgetLayoutProps} from 'superdesk-api'; + +/** + * Uses markup/styles from angular-based authoring and is intended to be rendered there. + */ +export class WidgetLayoutComponent extends React.PureComponent { + render() { + const {header, body, footer} = this.props; + + return ( + + {header && {header}} + +
+ {body} + + {footer && (
{footer}
)} +
+ + ); + } +} diff --git a/scripts/apps/authoring/widgets/widgets.ts b/scripts/apps/authoring/widgets/widgets.ts index 268d84c9e1..f67b03ad33 100644 --- a/scripts/apps/authoring/widgets/widgets.ts +++ b/scripts/apps/authoring/widgets/widgets.ts @@ -1,10 +1,13 @@ +import React from 'react'; import {flatMap, noop} from 'lodash'; import {isWidgetVisibleForContentProfile} from 'apps/workspace/content/components/WidgetsConfig'; import {gettext} from 'core/utils'; import {isKilled} from 'apps/archive/utils'; import {AuthoringWorkspaceService} from '../authoring/services/AuthoringWorkspaceService'; -import {IArticle, IContentProfile} from 'superdesk-api'; +import {IArticle, IAuthoringWidgetLayoutProps, IContentProfile} from 'superdesk-api'; import {appConfig, extensions} from 'appConfig'; +import {WidgetHeaderComponent} from './WidgetHeaderComponent'; +import {WidgetLayoutComponent} from './WidgetLayoutComponent'; const USER_PREFERENCE_SETTINGS = 'editor:pinned_widget'; @@ -92,10 +95,34 @@ function AuthoringWidgetsProvider() { }; } -export const widgetReactIntegration = { +export interface IWidgetIntegrationComponentProps { + widgetName: string; + pinned: boolean; + widget: any; + editMode: boolean; + pinWidget(widget: any): void; +} + +/** + * This was initially written for {@link AuthoringWidgetHeading} to work. + * Wrapper components for header/layout were later added in order to be able to use + * react-based layout components from ui-framework while maintaining existing markup + * and styles in the angular based authoring. + */ +interface IWidgetIntegration { + pinWidget(widget: any): void; + getActiveWidget(): any; + getPinnedWidget(): any; + WidgetHeaderComponent: React.ComponentType; + WidgetLayoutComponent: React.ComponentType; +} + +export const widgetReactIntegration: IWidgetIntegration = { pinWidget: noop as any, getActiveWidget: noop as any, getPinnedWidget: noop as any, + WidgetHeaderComponent: () => null, + WidgetLayoutComponent: () => null, }; WidgetsManagerCtrl.$inject = ['$scope', '$routeParams', 'authoringWidgets', 'archiveService', 'authoringWorkspace', @@ -298,6 +325,11 @@ function WidgetsManagerCtrl( widgetReactIntegration.pinWidget = $scope.pinWidget; widgetReactIntegration.getActiveWidget = () => $scope.active ?? $scope.pinnedWidget; + widgetReactIntegration.getPinnedWidget = + () => $scope.widgets.find(({pinned}) => pinned === true)?.name ?? null; + + widgetReactIntegration.WidgetHeaderComponent = WidgetHeaderComponent; + widgetReactIntegration.WidgetLayoutComponent = WidgetLayoutComponent; this.updateUserPreferences = (widget?: IWidget) => { let update = []; diff --git a/scripts/apps/dashboard/widget-heading.tsx b/scripts/apps/dashboard/widget-heading.tsx index c2758e8a18..e0ed06ba13 100644 --- a/scripts/apps/dashboard/widget-heading.tsx +++ b/scripts/apps/dashboard/widget-heading.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import classNames from 'classnames'; import {IPropsWidgetHeading} from 'superdesk-api'; import {widgetReactIntegration} from 'apps/authoring/widgets/widgets'; @@ -10,46 +9,25 @@ import {widgetReactIntegration} from 'apps/authoring/widgets/widgets'; * * It also encapsulates widget actions like pinning * without exposing the implementation details to extensions. + * + * !!! Can't use React.PureComponent because it gets props from outside */ -export class WidgetHeading extends React.PureComponent { +export class AuthoringWidgetHeading extends React.Component { render() { const widget = widgetReactIntegration.getActiveWidget(); - const {pinWidget} = widgetReactIntegration; + const pinned = widgetReactIntegration.getPinnedWidget() === this.props.widgetName; + const {pinWidget, WidgetHeaderComponent} = widgetReactIntegration; return ( -
-
- {this.props.widgetName} - - - -
- - { - this.props.editMode && ( -
- {this.props.children} -
- ) - } -
+ + {this.props.children} + ); } } diff --git a/scripts/apps/dashboard/widget-layout.tsx b/scripts/apps/dashboard/widget-layout.tsx new file mode 100644 index 0000000000..42efee5a92 --- /dev/null +++ b/scripts/apps/dashboard/widget-layout.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import {widgetReactIntegration} from 'apps/authoring/widgets/widgets'; +import {IAuthoringWidgetLayoutProps} from 'superdesk-api'; + +export class AuthoringWidgetLayout extends React.PureComponent { + render() { + const {WidgetLayoutComponent} = widgetReactIntegration; + + return ( + + ); + } +} diff --git a/scripts/core/get-superdesk-api-implementation.tsx b/scripts/core/get-superdesk-api-implementation.tsx index 34af7a06fd..89a9d018bb 100644 --- a/scripts/core/get-superdesk-api-implementation.tsx +++ b/scripts/core/get-superdesk-api-implementation.tsx @@ -79,7 +79,8 @@ import {querySelectorParent} from './helpers/dom/querySelectorParent'; import {showIgnoreCancelSaveDialog} from './ui/components/IgnoreCancelSaveDialog'; import {Editor3Html} from './editor3/Editor3Html'; import {arrayToTree, treeToArray} from './helpers/tree'; -import {WidgetHeading} from 'apps/dashboard/widget-heading'; +import {AuthoringWidgetHeading} from 'apps/dashboard/widget-heading'; +import {AuthoringWidgetLayout} from 'apps/dashboard/widget-layout'; function getContentType(id): Promise { return dataApi.findOne('content_types', id); @@ -350,7 +351,8 @@ export function getSuperdeskApiImplementation( getLiveQueryHOC: () => WithLiveQuery, WithLiveResources, Editor3Html, - WidgetHeading, + AuthoringWidgetHeading, + AuthoringWidgetLayout, }, forms: { FormFieldType, diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index eb1b7645e1..1b04b89fec 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -65,6 +65,12 @@ declare module 'superdesk-api' { query: {[key: string]: any}; } + export interface IAuthoringWidgetLayoutProps { + header?: JSX.Element; + body: JSX.Element; + footer?: JSX.Element; + } + export interface IAuthoringSideWidget { _id: string; // required for configuring widget visibility in content profile label: string; @@ -1700,7 +1706,8 @@ declare module 'superdesk-api' { WithLiveResources: React.ComponentType; Spacer: React.ComponentType; Editor3Html: React.ComponentType; - WidgetHeading: React.ComponentType; + AuthoringWidgetHeading: React.ComponentType; + AuthoringWidgetLayout: React.ComponentType; }; forms: { FormFieldType: typeof FormFieldType; diff --git a/scripts/extensions/auto-tagging-widget/src/auto-tagging.tsx b/scripts/extensions/auto-tagging-widget/src/auto-tagging.tsx index 84e79afb55..e7b2ad3703 100644 --- a/scripts/extensions/auto-tagging-widget/src/auto-tagging.tsx +++ b/scripts/extensions/auto-tagging-widget/src/auto-tagging.tsx @@ -119,7 +119,7 @@ export function getAutoTaggingComponent(superdesk: ISuperdesk, label: string) { const {httpRequestJsonLocal} = superdesk; const {gettext, gettextPlural} = superdesk.localization; const {memoize, generatePatch, arrayToTree} = superdesk.utilities; - const {WidgetHeading, Alert} = superdesk.components; + const {AuthoringWidgetHeading, AuthoringWidgetLayout, Alert} = superdesk.components; const groupLabels = getGroups(superdesk); const TagListComponent = getTagsListComponent(superdesk); @@ -279,287 +279,257 @@ export function getAutoTaggingComponent(superdesk: ISuperdesk, label: string) { const readOnly = superdesk.entities.article.isLockedInOtherSession(this.props.article); return ( - - { - (() => { - if (data === 'loading' || data === 'not-initialized') { - return null; - } else { - const treeErrors = arrayToTree( - data.changes.analysis.toArray(), - (item) => item.qcode, - (item) => item.parent, - ).errors; - - // only show errors when there are unsaved changes - if (treeErrors.length > 0 && dirty) { - return ( - { - showImatricsServiceErrorModal(superdesk, treeErrors); - }, - icon: 'info-sign', - }, - ]} + + { + data === 'loading' || data === 'not-initialized' || !dirty ? null : ( + + - - -
- ) - } - - -
-
-
- - { - const newValue = !runAutomaticallyPreference; - - this.setState({runAutomaticallyPreference: newValue}); - - superdesk.preferences.set(RUN_AUTOMATICALLY_PREFERENCE, newValue); - - if (newValue && this.state.data === 'not-initialized') { - this.runAnalysis(); - } - }} - label={{text: gettext('Run automatically')}} - /> - -
- + }} + /> + + ) + } + + )} + body={( + { - data === 'loading' || data === 'not-initialized' ? null : ( -
-
- { - let cancelled = false; - - httpRequestJsonLocal({ - method: 'POST', - path: '/ai_data_op/', - payload: { - service: 'imatrics', - operation: 'search', - data: {term: searchString}, + (() => { + if (data === 'loading' || data === 'not-initialized') { + return null; + } else { + const treeErrors = arrayToTree( + data.changes.analysis.toArray(), + (item) => item.qcode, + (item) => item.parent, + ).errors; + + // only show errors when there are unsaved changes + if (treeErrors.length > 0 && dirty) { + return ( + { + showImatricsServiceErrorModal(superdesk, treeErrors); + }, + icon: 'info-sign', }, - }).then((res) => { - if (cancelled !== true) { - const result = toClientFormat(res.result.tags).toArray(); + ]} + /> + ); + } else { + return null; + } + } + })() + } - const withoutExistingTags = result.filter( - (searchTag) => tagAlreadyExists( - data, - searchTag.qcode, - ) !== true, - ); +
+
+ + { + const newValue = !runAutomaticallyPreference; - callback(withoutExistingTags); - } - }); + this.setState({runAutomaticallyPreference: newValue}); - return { - cancel: () => { - cancelled = true; - }, - }; - }} - listItemTemplate={(__item: any) => { - const _item: ITagUi = __item; - - return ( -
- {_item.name} - - { - _item?.group?.value == null ? null : ( -

{_item.group.value}

- ) - } + superdesk.preferences.set(RUN_AUTOMATICALLY_PREFERENCE, newValue); + + if (newValue && this.state.data === 'not-initialized') { + this.runAnalysis(); + } + }} + label={{text: gettext('Run automatically')}} + /> + +
- { - _item?.description == null ? null : ( -

{_item.description}

- ) + { + data === 'loading' || data === 'not-initialized' ? null : ( +
+
+ { + let cancelled = false; + + httpRequestJsonLocal({ + method: 'POST', + path: '/ai_data_op/', + payload: { + service: 'imatrics', + operation: 'search', + data: {term: searchString}, + }, + }).then((res) => { + if (cancelled !== true) { + const result = toClientFormat( + res.result.tags, + ).toArray(); + + const withoutExistingTags = result.filter( + (searchTag) => tagAlreadyExists( + data, + searchTag.qcode, + ) !== true, + ); + + callback(withoutExistingTags); } -
- ); - }} - onSelect={(_value: any) => { - const value = _value as ITagUi; - - this.insertTagFromSearch(value, data); - // TODO: clear autocomplete? - }} - onChange={noop} - /> -
+ }); -
-
-
- ) - } -
- - {(() => { - if (data === 'loading') { - return ( -
-
-
- ); - } else if (data === 'not-initialized') { - return ( - - ); - } else { - const items = data.changes.analysis; - const savedTags = data.original.analysis.keySeq().toSet(); - - const isEntity = (tag: ITagUi) => entityGroups.has(tag.group.value); - - const entities = items.filter((tag) => isEntity(tag)); - const entitiesGrouped = entities.groupBy((tag) => tag?.group.value); - - const entitiesGroupedAndSortedByConfig = entitiesGrouped - .filter((_, key) => hasConfig(key, this.iMatricsFields.entities)) - .sortBy((_, key) => this.iMatricsFields.entities[key].order, - (a, b) => a - b); - - const entitiesGroupedAndSortedNotInConfig = entitiesGrouped - .filter((_, key) => !hasConfig(key, this.iMatricsFields.entities)) - .sortBy((_, key) => key!.toString().toLocaleLowerCase(), - (a, b) => a.localeCompare(b)); - - const entitiesGroupedAndSorted = entitiesGroupedAndSortedByConfig - .concat(entitiesGroupedAndSortedNotInConfig); - - const others = items.filter((tag) => isEntity(tag) === false); - const othersGrouped = others.groupBy((tag) => tag.group.value); - - let allGrouped = OrderedMap(); - - othersGrouped.forEach((tags, groupId) => { - if (tags != null && groupId != null) { - allGrouped = allGrouped.set(groupId, - - { - this.updateTags( - ids.reduce( - (analysis, id) => analysis.remove(id), - data.changes.analysis, - ), - data, + return { + cancel: () => { + cancelled = true; + }, + }; + }} + listItemTemplate={(__item: any) => { + const _item: ITagUi = __item; + + return ( +
+ {_item.name} + + { + _item?.group?.value == null ? null : ( +

{_item.group.value}

+ ) + } + + { + _item?.description == null ? null : ( +

{_item.description}

+ ) + } +
); }} + onSelect={(_value: any) => { + const value = _value as ITagUi; + + this.insertTagFromSearch(value, data); + // TODO: clear autocomplete? + }} + onChange={noop} /> - , - ); - } - }); - - if (entitiesGroupedAndSorted.size > 0) { - allGrouped = allGrouped.set('entities', - - {entitiesGroupedAndSorted.map((tags, key) => ( -
-
- {groupLabels.get(key).plural} -
+
+ +
+
+
+ ) + } +
+ + {(() => { + if (data === 'loading') { + return ( +
+
+
+ ); + } else if (data === 'not-initialized') { + return ( + + ); + } else { + const items = data.changes.analysis; + const savedTags = data.original.analysis.keySeq().toSet(); + + const isEntity = (tag: ITagUi) => entityGroups.has(tag.group.value); + + const entities = items.filter((tag) => isEntity(tag)); + const entitiesGrouped = entities.groupBy((tag) => tag?.group.value); + + const entitiesGroupedAndSortedByConfig = entitiesGrouped + .filter((_, key) => hasConfig(key, this.iMatricsFields.entities)) + .sortBy((_, key) => this.iMatricsFields.entities[key].order, + (a, b) => a - b); + + const entitiesGroupedAndSortedNotInConfig = entitiesGrouped + .filter((_, key) => !hasConfig(key, this.iMatricsFields.entities)) + .sortBy((_, key) => key!.toString().toLocaleLowerCase(), + (a, b) => a.localeCompare(b)); + + const entitiesGroupedAndSorted = entitiesGroupedAndSortedByConfig + .concat(entitiesGroupedAndSortedNotInConfig); + + const others = items.filter((tag) => isEntity(tag) === false); + const othersGrouped = others.groupBy((tag) => tag.group.value); + + let allGrouped = OrderedMap(); + + othersGrouped.forEach((tags, groupId) => { + if (tags != null && groupId != null) { + allGrouped = allGrouped.set(groupId, + -
- )).toArray()} - , - ); - } - - const allGroupedAndSortedByConfig = allGrouped - .filter((_, key) => hasConfig(key, this.iMatricsFields.others)) - .sortBy((_, key) => this.iMatricsFields.others[key].order, - (a, b) => a - b); - - const allGroupedAndSortedNotInConfig = allGrouped - .filter((_, key) => !hasConfig(key, this.iMatricsFields.others)); - - const allGroupedAndSorted = allGroupedAndSortedByConfig - .concat(allGroupedAndSortedNotInConfig); - - return ( - - { - this.state.newItem == null ? null : ( - { - this.setState({newItem}); - }} - save={(newItem: INewItem) => { - this.createNewTag(newItem, data); - }} - cancel={() => { - this.setState({newItem: null}); - }} - tagAlreadyExists={ - (qcode) => tagAlreadyExists(data, qcode) - } - insertTagFromSearch={(tag: ITagUi) => { - this.insertTagFromSearch(tag, data); - }} - /> - ) + , + ); } + }); -
- {allGroupedAndSorted.map((item) => item).toArray()} -
- - ); - } - })()} + if (entitiesGroupedAndSorted.size > 0) { + allGrouped = allGrouped.set('entities', + + {entitiesGroupedAndSorted.map((tags, key) => ( +
+
+ {groupLabels.get(key).plural} +
+ { + this.updateTags( + ids.reduce( + (analysis, id) => analysis.remove(id), + data.changes.analysis, + ), + data, + ); + }} + /> +
+ )).toArray()} + , + ); + } + + const allGroupedAndSortedByConfig = allGrouped + .filter((_, key) => hasConfig(key, this.iMatricsFields.others)) + .sortBy((_, key) => this.iMatricsFields.others[key].order, + (a, b) => a - b); + + const allGroupedAndSortedNotInConfig = allGrouped + .filter((_, key) => !hasConfig(key, this.iMatricsFields.others)); + + const allGroupedAndSorted = allGroupedAndSortedByConfig + .concat(allGroupedAndSortedNotInConfig); -
- {(() => { - if (data === 'loading') { - return null; - } else if (data === 'not-initialized') { - return ( -
-
- + + )} + footer={(() => { + if (data === 'loading') { + return undefined; + } else if (data === 'not-initialized') { + return ( + + + + { this.props.editMode && ( diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index 40f003fedc..2e5c66deae 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -402,7 +402,9 @@ describe('authoring', () => { })); it('can unlock on close editable item without changes made', - inject((authoring, confirm, lock, $rootScope, session) => { + (done) => inject((authoring, confirm, lock, $rootScope, session) => { + const onClose = jasmine.createSpy('onClose2'); + const itemLocked = { ...ITEM, lock_user: session.identity._id, @@ -410,10 +412,15 @@ describe('authoring', () => { }; expect(authoring.isEditable(itemLocked)).toBe(true); - authoring.close(itemLocked, itemLocked, false); + authoring.close(itemLocked, itemLocked, false, onClose); $rootScope.$digest(); - expect(confirm.confirm).not.toHaveBeenCalled(); - expect(lock.unlock).toHaveBeenCalled(); + + setTimeout(() => { + expect(confirm.confirm).not.toHaveBeenCalled(); + expect(lock.unlock).toHaveBeenCalled(); + expect(onClose).toHaveBeenCalled(); + done(); + }, 100); })); it('can unlock an item', inject((authoring, session, confirm, autosave) => { diff --git a/scripts/apps/authoring/widgets/widgets.ts b/scripts/apps/authoring/widgets/widgets.ts index f67b03ad33..aa8eb16a39 100644 --- a/scripts/apps/authoring/widgets/widgets.ts +++ b/scripts/apps/authoring/widgets/widgets.ts @@ -101,6 +101,7 @@ export interface IWidgetIntegrationComponentProps { widget: any; editMode: boolean; pinWidget(widget: any): void; + closeWidget(): void; } /** @@ -112,6 +113,7 @@ export interface IWidgetIntegrationComponentProps { interface IWidgetIntegration { pinWidget(widget: any): void; getActiveWidget(): any; + closeActiveWidget(): any; getPinnedWidget(): any; WidgetHeaderComponent: React.ComponentType; WidgetLayoutComponent: React.ComponentType; @@ -121,6 +123,7 @@ export const widgetReactIntegration: IWidgetIntegration = { pinWidget: noop as any, getActiveWidget: noop as any, getPinnedWidget: noop as any, + closeActiveWidget: noop, WidgetHeaderComponent: () => null, WidgetLayoutComponent: () => null, }; diff --git a/scripts/apps/dashboard/widget-heading.tsx b/scripts/apps/dashboard/widget-heading.tsx index e0ed06ba13..7bc3cf5f08 100644 --- a/scripts/apps/dashboard/widget-heading.tsx +++ b/scripts/apps/dashboard/widget-heading.tsx @@ -25,6 +25,7 @@ export class AuthoringWidgetHeading extends React.Component widget={widget} widgetName={this.props.widgetName} editMode={this.props.editMode} + closeWidget={() => widgetReactIntegration.closeActiveWidget()} > {this.props.children} From cf59f1b0375744fc44ef8bd55f3e56898ab3c9f4 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 12 Nov 2021 17:12:47 +0100 Subject: [PATCH 0130/1070] update usage of ui-framework components to match updated interface --- .../sams/src/components/assets/assetEditorPanel.tsx | 2 +- .../sams/src/components/assets/selectAssetModal.tsx | 2 +- .../extensions/sams/src/components/sets/manageSetsModal.tsx | 2 +- .../extensions/sams/src/components/sets/setEditorPanel.tsx | 2 +- scripts/extensions/sams/src/components/workspaceSubnav.tsx | 4 ++-- scripts/extensions/sams/src/containers/FileUploadModal.tsx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/extensions/sams/src/components/assets/assetEditorPanel.tsx b/scripts/extensions/sams/src/components/assets/assetEditorPanel.tsx index ddfbab9887..bc90c50a73 100644 --- a/scripts/extensions/sams/src/components/assets/assetEditorPanel.tsx +++ b/scripts/extensions/sams/src/components/assets/assetEditorPanel.tsx @@ -120,7 +120,7 @@ export class AssetEditorPanelComponent extends React.PureComponent - +
+ )} + footer={( +
test footer
+ )} + /> + ); + } +} + +export function getDemoWidget() { + const metadataWidget: IAuthoringSideWidget = { + _id: 'metadata', + label: getLabel(), + order: 2, + icon: 'info', + component: DemoWidget, + }; + + return metadataWidget; +} diff --git a/scripts/core/get-superdesk-api-implementation.tsx b/scripts/core/get-superdesk-api-implementation.tsx index 89a9d018bb..f7e24da1dd 100644 --- a/scripts/core/get-superdesk-api-implementation.tsx +++ b/scripts/core/get-superdesk-api-implementation.tsx @@ -81,6 +81,7 @@ import {Editor3Html} from './editor3/Editor3Html'; import {arrayToTree, treeToArray} from './helpers/tree'; import {AuthoringWidgetHeading} from 'apps/dashboard/widget-heading'; import {AuthoringWidgetLayout} from 'apps/dashboard/widget-layout'; +import {patchArticle} from 'api/article-patch'; function getContentType(id): Promise { return dataApi.findOne('content_types', id); @@ -207,36 +208,7 @@ export function getSuperdeskApiImplementation( isLocked: sdApi.article.isLocked, isLockedInCurrentSession: sdApi.article.isLockedInCurrentSession, isLockedInOtherSession: sdApi.article.isLockedInOtherSession, - patch: (article, patch, dangerousOptions) => { - const onPatchBeforeMiddlewares = Object.values(extensions) - .map((extension) => extension.activationResult?.contributions?.entities?.article?.onPatchBefore) - .filter((middleware) => middleware != null); - - return onPatchBeforeMiddlewares.reduce( - (current, next) => current.then((result) => next(article._id, result, dangerousOptions)), - Promise.resolve(patch), - ).then((patchFinal) => { - return dataApi.patchRaw( - // distinction between handling published and non-published items - // should be removed: SDESK-4687 - (sdApi.article.isPublished(article) ? 'published' : 'archive'), - article._id, - article._etag, - patchFinal, - ).then((res) => { - if (dangerousOptions?.patchDirectlyAndOverwriteAuthoringValues === true) { - dispatchInternalEvent( - 'dangerouslyOverwriteAuthoringData', - {...patch, _etag: res._etag, _id: res._id}, - ); - } - }); - }).catch((err) => { - if (err instanceof Error) { - logger.error(err); - } - }); - }, + patch: patchArticle, isArchived: sdApi.article.isArchived, isPublished: (article) => sdApi.article.isPublished(article), }, diff --git a/scripts/index.ts b/scripts/index.ts index 28ef2748ef..f733767527 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -22,6 +22,7 @@ import {setupTansa} from 'apps/tansa'; import {i18n} from 'core/utils'; import {configurableAlgorithms} from 'core/ui/configurable-algorithms'; import {merge} from 'lodash'; +import {registerAuthoringReactWidgets} from 'apps/authoring-react/manage-widget-registration'; let body = angular.element('body'); @@ -180,7 +181,9 @@ export function startApp( metadata, _workspaceMenu, preferencesService, - ); + ).then(() => { + registerAuthoringReactWidgets(); + }); }, ]); From 91604950e7e1ce641796029528ab592724464acf Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 17 Nov 2021 12:53:33 +0100 Subject: [PATCH 0132/1070] merge tomaskikutis:content-profiles-for-non-text-content-types --- e2e/client/specs/_unstable-tests.txt | 1 + package-lock.json | 160 +++-- package.json | 1 + .../apps/archive/directives/MediaPreview.ts | 4 +- .../archive/directives/RelatedItemsPreview.ts | 4 +- .../authoring/authoring-custom-field.tsx | 10 +- .../authoring/preview-custom-field.tsx | 4 +- scripts/apps/authoring/macros/macros.spec.ts | 10 +- .../apps/authoring/preview/fullPreview.tsx | 2 +- .../apps/authoring/tests/authoring.spec.ts | 14 +- .../apps/desks/directives/DeskConfigModal.ts | 2 +- .../apps/desks/tests/contentExpiry.spec.ts | 1 + .../InternalDestinations.tsx | 114 ++-- .../monitoring/controllers/AggregateCtrl.ts | 2 +- .../directives/RelatedItemsDirective.ts | 4 +- .../relations/services/RelationsService.ts | 4 +- scripts/apps/search/components/Item.tsx | 16 +- .../search/components/preview-subject.tsx | 4 +- .../components/system-messages-settings.tsx | 115 ++-- .../directives/TemplatesDirective.ts | 2 +- .../components/ContentProfileFieldsConfig.tsx | 638 ++++++++++++++++++ .../get-content-profiles-form-config.tsx | 346 ++++++++++ .../content/components/get-editor-config.tsx | 113 ++++ scripts/apps/workspace/content/constants.ts | 61 -- .../controllers/ContentProfileFields.ts | 208 ------ .../controllers/ContentProfilesController.ts | 132 +++- .../directives/ContentProfileSchemaEditor.ts | 227 ------- .../content/directives/SortContentProfiles.ts | 52 -- .../workspace/content/directives/index.ts | 2 - scripts/apps/workspace/content/index.ts | 20 +- .../content/services/ContentService.ts | 82 +-- .../workspace/content/styles/profiles.scss | 5 +- .../workspace/content/tests/content.spec.ts | 30 +- .../content/views/profile-settings.html | 135 ++-- .../views/schema-editor-fields-dropdown.html | 17 - .../content/views/schema-editor.html | 119 ---- .../workspace/helpers/getTypeForFieldId.ts | 6 +- scripts/core/editor3/store/index.ts | 4 +- scripts/core/helpers/CrudManager.tsx | 4 +- scripts/core/helpers/network.tsx | 7 +- scripts/core/superdesk-api.d.ts | 126 +++- .../generic-list-page-item-view-edit.tsx | 114 ++-- .../components/ListPage/generic-list-page.tsx | 416 +++++++----- scripts/core/ui/components/Page/index.tsx | 2 +- .../generic-form/form-direction-wrapper.tsx | 2 +- .../ui/components/generic-form/form-field.tsx | 13 +- .../ui/components/generic-form/from-group.tsx | 10 +- .../generate-filter-for-server.tsx | 4 +- .../get-form-group-for-filtering.tsx | 10 +- .../generic-form/get-initial-values.tsx | 4 +- .../ui/components/generic-form/has-value.tsx | 12 +- .../generic-form/input-types/checkbox.tsx | 6 +- .../{text-single-line.tsx => number.tsx} | 12 +- .../generic-form/input-types/plain-text.tsx | 57 ++ .../input-types/select_multiple_values.tsx | 66 ++ .../select_single_value_static.tsx | 61 ++ .../generic-form/interfaces/form.ts | 4 +- .../generic-form/interfaces/input-types.tsx | 1 + .../generic-form/tests/generic-form.spec.tsx | 22 +- .../core/ui/components/only-with-children.tsx | 57 ++ scripts/core/utils.ts | 26 +- .../src/AnnotationInputWithKnowledgeBase.tsx | 6 +- .../annotationsLibrary/src/GetFields.ts | 2 +- .../src/annotations-library-page.tsx | 94 +-- styles/sass/forms.scss | 3 + styles/sass/sf-additional.scss | 11 + 66 files changed, 2450 insertions(+), 1373 deletions(-) create mode 100644 scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx create mode 100644 scripts/apps/workspace/content/components/get-content-profiles-form-config.tsx create mode 100644 scripts/apps/workspace/content/components/get-editor-config.tsx delete mode 100644 scripts/apps/workspace/content/controllers/ContentProfileFields.ts delete mode 100644 scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts delete mode 100644 scripts/apps/workspace/content/directives/SortContentProfiles.ts delete mode 100644 scripts/apps/workspace/content/views/schema-editor-fields-dropdown.html delete mode 100644 scripts/apps/workspace/content/views/schema-editor.html rename scripts/core/ui/components/generic-form/input-types/{text-single-line.tsx => number.tsx} (71%) create mode 100644 scripts/core/ui/components/generic-form/input-types/plain-text.tsx create mode 100644 scripts/core/ui/components/generic-form/input-types/select_multiple_values.tsx create mode 100644 scripts/core/ui/components/generic-form/input-types/select_single_value_static.tsx create mode 100644 scripts/core/ui/components/only-with-children.tsx diff --git a/e2e/client/specs/_unstable-tests.txt b/e2e/client/specs/_unstable-tests.txt index 8ff5c94c84..1a855b14f8 100644 --- a/e2e/client/specs/_unstable-tests.txt +++ b/e2e/client/specs/_unstable-tests.txt @@ -3,3 +3,4 @@ monitoring can display the item in Desk Output when it's published in a producti authoring related item widget can open published item send warns that there are spelling mistakes master_desk show content view - edit item +can save and use language preferences diff --git a/package-lock.json b/package-lock.json index 52965a3973..08eadf6bf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", + "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", "requires": { - "@babel/highlight": "^7.14.5" + "@babel/highlight": "^7.16.0" } }, "@babel/helper-validator-identifier": { @@ -18,11 +18,11 @@ "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==" }, "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz", + "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==", "requires": { - "@babel/helper-validator-identifier": "^7.14.5", + "@babel/helper-validator-identifier": "^7.15.7", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -61,14 +61,14 @@ } }, "@babel/parser": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", - "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==" + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==" }, "@babel/runtime": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", - "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "version": "7.16.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", + "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", "requires": { "regenerator-runtime": "^0.13.4" }, @@ -264,9 +264,9 @@ }, "dependencies": { "csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "dom-helpers": { "version": "5.2.1", @@ -404,9 +404,9 @@ } }, "@types/node": { - "version": "16.11.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz", - "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==" + "version": "16.11.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", + "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" }, "@types/parse5": { "version": "5.0.3", @@ -1156,9 +1156,9 @@ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", "requires": { "safer-buffer": "~2.1.0" } @@ -2049,9 +2049,9 @@ } }, "caniuse-db": { - "version": "1.0.30001272", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001272.tgz", - "integrity": "sha512-/NplzwUm4ZCpKOJs/zq3newlycZ/T7sW9xVFINmDyRBmmSoqTpQQTAJ0f+a4xfOODI8T6aM23GGGVQwoxZAgdw==" + "version": "1.0.30001282", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001282.tgz", + "integrity": "sha512-czsWYzaRcSfPVTWzxwl6xo6JdVPTTShJoWjAO7ZYArI3oKFe7COLk3G9k/WVysOCEs5Jiu66Ly+8nRLlj85vdw==" }, "caseless": { "version": "0.12.0", @@ -3616,9 +3616,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.884", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.884.tgz", - "integrity": "sha512-kOaCAa+biA98PwH5BpCkeUeTL6mCeg8p3Q3OhqzPyqhu/5QUnWAN2wr/3IK8xMQxIV76kfoQpP+Bn/wij/jXrg==" + "version": "1.3.900", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.900.tgz", + "integrity": "sha512-SuXbQD8D4EjsaBaJJxySHbC+zq8JrFfxtb4GIr4E9n1BcROyMcRrJCYQNpJ9N+Wjf5mFp7Wp0OHykd14JNEzzQ==" }, "elliptic": { "version": "6.5.4", @@ -5518,9 +5518,9 @@ "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==" }, "follow-redirects": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", - "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==" + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" }, "for-in": { "version": "1.0.2", @@ -8130,16 +8130,16 @@ "optional": true }, "is-my-json-valid": { - "version": "2.20.5", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz", - "integrity": "sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==", + "version": "2.20.6", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz", + "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==", "dev": true, "optional": true, "requires": { "generate-function": "^2.0.0", "generate-object-property": "^1.1.0", "is-my-ip-valid": "^1.0.0", - "jsonpointer": "^4.0.0", + "jsonpointer": "^5.0.0", "xtend": "^4.0.0" } }, @@ -8559,9 +8559,9 @@ } }, "jsonpointer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz", - "integrity": "sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz", + "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==", "dev": true, "optional": true }, @@ -9051,9 +9051,9 @@ } }, "keycode": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", - "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", + "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, "killable": { "version": "1.0.1", @@ -10150,16 +10150,16 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", - "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==" + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, "mime-types": { - "version": "2.1.33", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", - "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "requires": { - "mime-db": "1.50.0" + "mime-db": "1.51.0" } }, "mimic-fn": { @@ -11258,9 +11258,9 @@ }, "dependencies": { "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", + "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==", "dev": true, "optional": true }, @@ -11272,17 +11272,17 @@ "optional": true }, "http-errors": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", - "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "optional": true, "requires": { "depd": "~1.1.2", "inherits": "2.0.4", - "setprototypeof": "1.1.1", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" } }, "https-proxy-agent": { @@ -11319,17 +11319,31 @@ } }, "raw-body": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", - "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz", + "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==", "dev": true, "optional": true, "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.3", + "bytes": "3.1.1", + "http-errors": "1.8.1", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "optional": true + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "optional": true } } }, @@ -12948,6 +12962,16 @@ } } }, + "react-sortable-hoc": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-1.11.0.tgz", + "integrity": "sha512-v1CDCvdfoR3zLGNp6qsBa4J1BWMEVH25+UKxF/RvQRh+mrB+emqtVHMgZ+WreUiKJoEaiwYoScaueIKhMVBHUg==", + "requires": { + "@babel/runtime": "^7.2.0", + "invariant": "^2.2.4", + "prop-types": "^15.5.7" + } + }, "react-test-renderer": { "version": "16.14.0", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz", @@ -14444,9 +14468,9 @@ } }, "spdx-license-ids": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", - "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" }, "spdy": { "version": "3.4.7", @@ -15400,9 +15424,9 @@ }, "dependencies": { "@types/node": { - "version": "14.17.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz", - "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==" + "version": "14.17.33", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.33.tgz", + "integrity": "sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g==" } } }, diff --git a/package.json b/package.json index 7d844c6390..712af581b5 100644 --- a/package.json +++ b/package.json @@ -111,6 +111,7 @@ "react-paginate": "6.3.0", "react-portal": "4.1.3", "react-redux": "7.2.1", + "react-sortable-hoc": "1.11.0", "react-textarea-autosize": "5.2.1", "redux": "4.0.5", "redux-logger": "3.0.6", diff --git a/scripts/apps/archive/directives/MediaPreview.ts b/scripts/apps/archive/directives/MediaPreview.ts index 478549700d..e7e3c42d97 100644 --- a/scripts/apps/archive/directives/MediaPreview.ts +++ b/scripts/apps/archive/directives/MediaPreview.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import {checkRenditions, getAssociationsByFieldId} from 'apps/authoring/authoring/controllers/AssociationController'; -import {IArticleField} from 'superdesk-api'; +import {IVocabulary} from 'superdesk-api'; import {appConfig} from 'appConfig'; /** @@ -29,7 +29,7 @@ export function MediaPreview(api, $rootScope, desks, superdesk, content, storage const setSubjectPreviewFields = () => { scope.subjectPreviewFields = content.previewFields(scope.editor, scope.fields) - .filter((field: IArticleField) => field.field_type == null); + .filter((field: IVocabulary) => field.field_type == null); }; scope.isCorrectionWorkflowEnabled = appConfig?.corrections_workflow; diff --git a/scripts/apps/archive/directives/RelatedItemsPreview.ts b/scripts/apps/archive/directives/RelatedItemsPreview.ts index c6479e3f31..393454fb6f 100644 --- a/scripts/apps/archive/directives/RelatedItemsPreview.ts +++ b/scripts/apps/archive/directives/RelatedItemsPreview.ts @@ -1,4 +1,4 @@ -import {IArticle, IArticleField, IRendition} from 'superdesk-api'; +import {IArticle, IVocabulary, IRendition} from 'superdesk-api'; import {gettext} from 'core/utils'; import {getThumbnailForItem} from 'core/helpers/item'; @@ -15,7 +15,7 @@ import {getThumbnailForItem} from 'core/helpers/item'; interface IScope extends ng.IScope { item: IArticle; - field: IArticleField; + field: IVocabulary; preview: boolean; loading: boolean; relatedItems: Array; diff --git a/scripts/apps/authoring/authoring/authoring-custom-field.tsx b/scripts/apps/authoring/authoring/authoring-custom-field.tsx index 4c0e1e4ac5..9b000faaae 100644 --- a/scripts/apps/authoring/authoring/authoring-custom-field.tsx +++ b/scripts/apps/authoring/authoring/authoring-custom-field.tsx @@ -2,13 +2,13 @@ import React from 'react'; import {get, throttle, Cancelable} from 'lodash'; import {getField} from 'apps/fields'; -import {IArticle, IArticleField, ITemplate} from 'superdesk-api'; +import {IArticle, IVocabulary, ITemplate} from 'superdesk-api'; interface IProps { item: IArticle; - field: IArticleField; + field: IVocabulary; editable: boolean; - onChange: (field: IArticleField, value: any) => any; + onChange: (field: IVocabulary, value: any) => any; template?: ITemplate; } @@ -25,7 +25,7 @@ function getValue(props: IProps) { } export class AuthoringCustomField extends React.PureComponent { - onChangeThrottled: ((field: IArticleField, value: any) => void) & Cancelable; + onChangeThrottled: ((field: IVocabulary, value: any) => void) & Cancelable; // IProps['item'] is mutated when updating so prevProps from `componentDidUpdate` // can't be used to compare the previous value. This property is used instead. @@ -40,7 +40,7 @@ export class AuthoringCustomField extends React.PureComponent { this.lastPropsValue = this.state.value; - this.onChangeThrottled = throttle((field: IArticleField, value: any) => { + this.onChangeThrottled = throttle((field: IVocabulary, value: any) => { this.props.onChange(field, value); }, 300, {leading: false}); diff --git a/scripts/apps/authoring/authoring/preview-custom-field.tsx b/scripts/apps/authoring/authoring/preview-custom-field.tsx index 1cfb77854a..77c1de8af9 100644 --- a/scripts/apps/authoring/authoring/preview-custom-field.tsx +++ b/scripts/apps/authoring/authoring/preview-custom-field.tsx @@ -2,11 +2,11 @@ import React from 'react'; import {get, isEmpty} from 'lodash'; import {getField} from 'apps/fields'; -import {IArticle, IArticleField} from 'superdesk-api'; +import {IArticle, IVocabulary} from 'superdesk-api'; interface IProps { item: IArticle; - field: IArticleField; + field: IVocabulary; } export class PreviewCustomField extends React.PureComponent { diff --git a/scripts/apps/authoring/macros/macros.spec.ts b/scripts/apps/authoring/macros/macros.spec.ts index eee7e8136f..2096719faf 100644 --- a/scripts/apps/authoring/macros/macros.spec.ts +++ b/scripts/apps/authoring/macros/macros.spec.ts @@ -54,7 +54,9 @@ describe('macros', () => { var $controller; - beforeEach(inject((_$controller_, macros, $q) => { + beforeEach(inject((_$controller_, macros, $q, $httpBackend) => { + $httpBackend.whenGET(/api$/).respond({_links: {child: []}}); + $controller = _$controller_; spyOn(macros, 'get').and.returnValue($q.when([])); })); @@ -94,7 +96,7 @@ describe('macros', () => { it('trigger macro with diff does not update item', inject((macros, $q, autosave, $rootScope) => { var diff = {foo: 'bar'}; - var item = {_id: '1'}; + var item = {_id: '1', profile: '123'}; var $scope = startAuthoring(item, 'edit'); spyOn(macros, 'call').and.returnValue($q.when({item: item, diff: diff})); @@ -149,6 +151,7 @@ describe('macros', () => { genre: [{qcode: 'foo', name: 'bar'}], slugline: 'slugline', _etag: 'foo', + profile: '123', }; let macroItem = { _id: '1', @@ -156,6 +159,7 @@ describe('macros', () => { abstract: 'abstract', genre: [{qcode: 'zoo', name: 'zoo'}], _etag: 'bar', + profile: '123', }; let $scope = startAuthoring(item, 'edit'); @@ -186,6 +190,7 @@ describe('macros', () => { abstract: 'abstract', genre: [{qcode: 'foo', name: 'bar'}], slugline: 'slugline', + profile: '123', }; let macroItem = { _id: '1', @@ -193,6 +198,7 @@ describe('macros', () => { abstract: 'new abstract', slugline: 'new slugline', genre: [{qcode: 'zoo', name: 'zoo'}], + profile: '123', }; let $scope = startAuthoring(item, 'edit'); diff --git a/scripts/apps/authoring/preview/fullPreview.tsx b/scripts/apps/authoring/preview/fullPreview.tsx index c513d46fbf..44c2894ab3 100644 --- a/scripts/apps/authoring/preview/fullPreview.tsx +++ b/scripts/apps/authoring/preview/fullPreview.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {IArticle, IVocabulary} from 'superdesk-api'; import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId'; -import {ARTICLE_HEADER_FIELDS, ARTICLE_COMMON_FIELDS} from 'apps/workspace/content/controllers/ContentProfileFields'; +import {ARTICLE_HEADER_FIELDS, ARTICLE_COMMON_FIELDS} from 'apps/workspace/content/components/get-editor-config'; import {dataApi} from 'core/helpers/CrudManager'; import {PreviewFieldType} from './previewFieldByType'; import {IAuthoringField} from './types'; diff --git a/scripts/apps/authoring/tests/authoring.spec.ts b/scripts/apps/authoring/tests/authoring.spec.ts index 2e5c66deae..a5c843ad06 100644 --- a/scripts/apps/authoring/tests/authoring.spec.ts +++ b/scripts/apps/authoring/tests/authoring.spec.ts @@ -99,7 +99,7 @@ describe('authoring', () => { })); it('can save while item is being autosaved', (done) => inject(($rootScope, $timeout, $q, api) => { - var $scope = startAuthoring({headline: 'test', task: 'desk:1'}, 'edit'); + var $scope = startAuthoring({headline: 'test', task: 'desk:1', profile: '123'}, 'edit'); $scope.item.body_html = 'test'; $rootScope.$digest(); @@ -119,7 +119,7 @@ describe('authoring', () => { })); it('can close item after save work confirm', inject(($rootScope, $q, $location, authoring, reloadService) => { - startAuthoring({headline: 'test'}, 'edit'); + startAuthoring({headline: 'test', profile: '123'}, 'edit'); $location.search('item', 'foo'); $location.search('action', 'edit'); $rootScope.$digest(); @@ -136,7 +136,7 @@ describe('authoring', () => { })); it('can populate content metadata for undo', inject(($rootScope) => { - var orig = {headline: 'foo'}; + var orig = {headline: 'foo', profile: '123'}; var scope = startAuthoring(orig, 'edit'); expect(scope.origItem.headline).toBe('foo'); @@ -155,11 +155,13 @@ describe('authoring', () => { let item = { _id: 'test', headline: 'headline', + profile: '123', }; let rewriteOf = { _id: 'rewriteOf', headline: 'rewrite', + profile: '123', associations: { featuremedia: { @@ -193,11 +195,13 @@ describe('authoring', () => { let item = { _id: 'test', headline: 'headline', + profile: '123', }; let rewriteOf = { _id: 'rewriteOf', headline: 'rewrite', + profile: '123', associations: { featuremedia: { @@ -233,6 +237,7 @@ describe('authoring', () => { _id: 'test', headline: 'headline', rewrite_of: 'rewriteOf', + profile: '123', }; let rewriteOf = { @@ -243,6 +248,7 @@ describe('authoring', () => { }, }, + profile: '123', }; let defered = $q.defer(); @@ -285,6 +291,7 @@ describe('authoring', () => { let item = { _id: 'test', rewrite_of: 'rewriteOf', + profile: '123', }; let rewriteOf = { @@ -294,6 +301,7 @@ describe('authoring', () => { test: 'test', }, }, + profile: '123', }; let defered = $q.defer(); diff --git a/scripts/apps/desks/directives/DeskConfigModal.ts b/scripts/apps/desks/directives/DeskConfigModal.ts index 5b675632c4..6534b9d6b7 100644 --- a/scripts/apps/desks/directives/DeskConfigModal.ts +++ b/scripts/apps/desks/directives/DeskConfigModal.ts @@ -56,7 +56,7 @@ export function DeskConfigModal(metadata, content, templates, api) { * Initialize content types * @return {Object} profiles */ - content.getTypes().then((profiles) => { + content.getTypes('text').then((profiles) => { scope.profiles = profiles; }); diff --git a/scripts/apps/desks/tests/contentExpiry.spec.ts b/scripts/apps/desks/tests/contentExpiry.spec.ts index aeb0e3ae93..a182aa50f2 100644 --- a/scripts/apps/desks/tests/contentExpiry.spec.ts +++ b/scripts/apps/desks/tests/contentExpiry.spec.ts @@ -1,6 +1,7 @@ describe('content expiry', () => { beforeEach(window.module('superdesk.apps.desks')); beforeEach(window.module('superdesk.templates-cache')); + beforeEach(window.module('superdesk.apps.spellcheck')); function setupElement(context, contentExpiry) { let scope, elem, iscope; diff --git a/scripts/apps/internal-destinations/InternalDestinations.tsx b/scripts/apps/internal-destinations/InternalDestinations.tsx index 9fe8f96c8f..0b76d3eb52 100644 --- a/scripts/apps/internal-destinations/InternalDestinations.tsx +++ b/scripts/apps/internal-destinations/InternalDestinations.tsx @@ -1,18 +1,18 @@ /* eslint-disable react/no-multi-comp */ import React from 'react'; -import {getGenericListPageComponent, GenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; +import {getGenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; import {ListItemColumn, ListItemActionsMenu, ListItem} from 'core/components/ListItem'; import {getFormFieldPreviewComponent} from 'core/ui/components/generic-form/form-field'; import {IInternalDestination} from 'superdesk-interfaces/InternalDestination'; -import {IFormField, IFormGroup} from 'superdesk-api'; +import {IFormField, IFormGroup, IPropsGenericFormItemComponent} from 'superdesk-api'; import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; import {gettext} from 'core/utils'; function getNameField(): IFormField { return { label: gettext('Destination name'), - type: FormFieldType.textSingleLine, + type: FormFieldType.plainText, field: 'name', required: true, }; @@ -73,55 +73,56 @@ function getSendAfterScheduleField(): IFormField { }; } -const renderRow = ( - key: string, - item: IInternalDestination, - page: GenericListPageComponent, -) => ( - page.openPreview(item._id)} - inactive={!item.is_active} - data-test-id="internal-destinations-item" - > - - {getFormFieldPreviewComponent(item, getNameField())} - - { - item.is_active ? null : ( - - {gettext('Inactive')} +class ItemComponent extends React.PureComponent> { + render() { + const {item, page} = this.props; + + return ( + page.openPreview(item._id)} + inactive={!item.is_active} + data-test-id="internal-destinations-item" + > + + {getFormFieldPreviewComponent(item, getNameField())} - ) - } - -
- - -
- - -); + { + item.is_active ? null : ( + + {gettext('Inactive')} + + ) + } + +
+ + +
+ + + ); + } +} export class InternalDestinations extends React.Component { render() { @@ -140,13 +141,16 @@ export class InternalDestinations extends React.Component { }; const InternalDestinationsPageComponent = - getGenericListPageComponent('internal_destinations', formConfig); + getGenericListPageComponent( + 'internal_destinations', + formConfig, + {field: 'name', direction: 'ascending'}, + ); return ( formConfig} fieldForSearch={getNameField()} /> ); diff --git a/scripts/apps/monitoring/controllers/AggregateCtrl.ts b/scripts/apps/monitoring/controllers/AggregateCtrl.ts index 6dc6e0fdaa..81adddc862 100644 --- a/scripts/apps/monitoring/controllers/AggregateCtrl.ts +++ b/scripts/apps/monitoring/controllers/AggregateCtrl.ts @@ -617,7 +617,7 @@ export function AggregateCtrl($scope, desks, workspaces, preferencesService, sto }); function getActiveProfiles() { - content.getTypes(false).then((profiles) => { + content.getTypes('text', false).then((profiles) => { self.loading = false; self.activeProfiles = profiles; diff --git a/scripts/apps/relations/directives/RelatedItemsDirective.ts b/scripts/apps/relations/directives/RelatedItemsDirective.ts index 6a3d9a2835..d1e1b03301 100644 --- a/scripts/apps/relations/directives/RelatedItemsDirective.ts +++ b/scripts/apps/relations/directives/RelatedItemsDirective.ts @@ -1,7 +1,7 @@ import {getSuperdeskType} from 'core/utils'; import {gettext} from 'core/utils'; import {AuthoringWorkspaceService} from 'apps/authoring/authoring/services/AuthoringWorkspaceService'; -import {IArticle, IArticleField, IRendition} from 'superdesk-api'; +import {IArticle, IVocabulary, IRendition} from 'superdesk-api'; import {IDirectiveScope} from 'types/Angular/DirectiveScope'; import {getAssociationsByFieldId} from '../../authoring/authoring/controllers/AssociationController'; import {getThumbnailForItem} from 'core/helpers/item'; @@ -12,7 +12,7 @@ const isInArchive = (item: IArticle) => item._type != null && ARCHIVE_TYPES.incl interface IScope extends IDirectiveScope { onCreated: (items: Array) => void; gettext: (text: any, params?: any) => string; - field: IArticleField; + field: IVocabulary; editable: boolean; item: IArticle; loading: boolean; diff --git a/scripts/apps/relations/services/RelationsService.ts b/scripts/apps/relations/services/RelationsService.ts index def79e0f1e..44d2552cbb 100644 --- a/scripts/apps/relations/services/RelationsService.ts +++ b/scripts/apps/relations/services/RelationsService.ts @@ -1,5 +1,5 @@ import {zipObject} from 'lodash'; -import {IArticle, IArticleField} from 'superdesk-api'; +import {IArticle, IVocabulary} from 'superdesk-api'; import {isPublished, isIngested} from 'apps/archive/utils'; const RELATED_LINK_KEYS = 3; // links only have _id, type keys and order (and some old ones only _id) @@ -44,7 +44,7 @@ export function RelationsService(api, $q) { }; }; - this.itemHasAllowedStatus = function(item: IArticle, field: IArticleField) { + this.itemHasAllowedStatus = function(item: IArticle, field: IVocabulary) { const ALLOWED_WORKFLOWS = { ...this.getDefaultAllowedWorkflows(), ...(field?.field_options?.allowed_workflows || {}), diff --git a/scripts/apps/search/components/Item.tsx b/scripts/apps/search/components/Item.tsx index 486ffc6660..e3ef4830f0 100644 --- a/scripts/apps/search/components/Item.tsx +++ b/scripts/apps/search/components/Item.tsx @@ -271,15 +271,17 @@ export class Item extends React.Component { httpRequestJsonLocal<{_items: Array}>({ method: 'GET', path: '/published', - urlParams: {source: JSON.stringify({ - query: { - bool: { - must: {term: {family_id: item.archive_item.family_id}}, - must_not: {term: {_id: item.item_id}}, + urlParams: { + source: { + query: { + bool: { + must: {term: {family_id: item.archive_item.family_id}}, + must_not: {term: {_id: item.item_id}}, + }, }, + sort: [{'versioncreated': 'desc'}], }, - sort: [{'versioncreated': 'desc'}], - })}, + }, }).then((data) => { this.setState({loading: false, nested: data._items}); }).catch(() => { diff --git a/scripts/apps/search/components/preview-subject.tsx b/scripts/apps/search/components/preview-subject.tsx index 1fcd7de58c..3469b5e86a 100644 --- a/scripts/apps/search/components/preview-subject.tsx +++ b/scripts/apps/search/components/preview-subject.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import {IArticle, IArticleField} from 'superdesk-api'; +import {IArticle, IVocabulary} from 'superdesk-api'; interface IProps { item: IArticle; - fields: Array; + fields: Array; } export class PreviewSubject extends React.PureComponent { diff --git a/scripts/apps/system-messages/components/system-messages-settings.tsx b/scripts/apps/system-messages/components/system-messages-settings.tsx index e1f97b0428..0a11e55348 100644 --- a/scripts/apps/system-messages/components/system-messages-settings.tsx +++ b/scripts/apps/system-messages/components/system-messages-settings.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react/no-multi-comp */ import * as React from 'react'; import {gettext} from 'core/utils'; @@ -5,7 +6,7 @@ import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; import {ListItem, ListItemActionsMenu, ListItemColumn, ListItemRow} from 'core/components/ListItem'; import {getFormFieldPreviewComponent} from 'core/ui/components/generic-form/form-field'; import {getGenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; -import {IFormField, IFormGroup, IGenericListPageComponent} from 'superdesk-api'; +import {IFormField, IFormGroup, IPropsGenericFormItemComponent} from 'superdesk-api'; import {Label} from 'superdesk-ui-framework/react/components/Label'; import {assertNever} from 'core/helpers/typescript-helpers'; import {ISystemMessage, RESOURCE} from '..'; @@ -30,52 +31,58 @@ const getTypeLabel = (type: ISystemMessage['type']) => { } }; -export class SystemMessagesSettingsComponent extends React.PureComponent { - render() { - const formConfig: IFormGroup = { - type: 'inline', - direction: 'vertical', - form: [ - { - field: 'is_active', - label: gettext('Active'), - type: FormFieldType.checkbox, - }, - { - field: 'type', - label: gettext('Style'), - type: FormFieldType.select, - required: true, - component_parameters: { - options: [ - {id: 'primary', label: getTypeLabel('primary')}, - {id: 'success', label: getTypeLabel('success')}, - {id: 'warning', label: getTypeLabel('warning')}, - {id: 'alert', label: getTypeLabel('alert')}, - ], - }, - }, - { - field: 'message_title', - label: gettext('Title'), - type: FormFieldType.textSingleLine, - required: true, +/** + * It needs to be a function because calling gettext in the top level doesn't work + */ +function getFormConfig(): IFormGroup { + const formConfig: IFormGroup = { + type: 'inline', + direction: 'vertical', + form: [ + { + field: 'is_active', + label: gettext('Active'), + type: FormFieldType.checkbox, + }, + { + field: 'type', + label: gettext('Style'), + type: FormFieldType.select, + required: true, + component_parameters: { + options: [ + {id: 'primary', label: getTypeLabel('primary')}, + {id: 'success', label: getTypeLabel('success')}, + {id: 'warning', label: getTypeLabel('warning')}, + {id: 'alert', label: getTypeLabel('alert')}, + ], }, - { - field: 'message', - label: gettext('Message'), - type: FormFieldType.textEditor3, - required: true, - }, - ], - }; - - const renderRow = ( - key: string, - item: ISystemMessage, - page: IGenericListPageComponent, - ) => ( - page.openPreview(item._id)}> + }, + { + field: 'message_title', + label: gettext('Title'), + type: FormFieldType.plainText, + required: true, + }, + { + field: 'message', + label: gettext('Message'), + type: FormFieldType.textEditor3, + required: true, + }, + ], + }; + + return formConfig; +} + +class ItemComponent extends React.PureComponent> { + render() { + const {item, page} = this.props; + const formConfig = getFormConfig(); + + return ( + page.openPreview(item._id)}> @@ -127,15 +134,23 @@ export class SystemMessagesSettingsComponent extends React.PureComponent { ); + } +} - const ListComponent = getGenericListPageComponent(RESOURCE, formConfig); +export class SystemMessagesSettingsComponent extends React.PureComponent { + render() { + const formConfig = getFormConfig(); + const ListComponent = getGenericListPageComponent( + RESOURCE, + formConfig, + {field: 'message_title', direction: 'ascending'}, + ); return ( formConfig} /> ); diff --git a/scripts/apps/templates/directives/TemplatesDirective.ts b/scripts/apps/templates/directives/TemplatesDirective.ts index f28e75f0c6..e69719b543 100644 --- a/scripts/apps/templates/directives/TemplatesDirective.ts +++ b/scripts/apps/templates/directives/TemplatesDirective.ts @@ -35,7 +35,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday selectDesk(null); }); - content.getTypes().then(() => { + content.getTypes('text').then(() => { $scope.content_types = content.types; }); diff --git a/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx b/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx new file mode 100644 index 0000000000..ce5cf4167f --- /dev/null +++ b/scripts/apps/workspace/content/components/ContentProfileFieldsConfig.tsx @@ -0,0 +1,638 @@ +/* eslint-disable react/no-multi-comp */ +import React from 'react'; +import { + ICrudManager, + ICrudManagerResponse, + IItemWithId, + IPropsGenericFormItemComponent, + IPropsGenericFormContainer, + IContentProfile, + IContentProfileEditorConfig, + IVocabulary, +} from 'superdesk-api'; + +import {gettext, arrayInsert, arrayMove} from 'core/utils'; +import {IContentProfileType} from '../controllers/ContentProfilesController'; +import {assertNever} from 'core/helpers/typescript-helpers'; +import {GenericListPageComponent} from 'core/ui/components/ListPage/generic-list-page'; +import {SortableContainer, SortableElement} from 'react-sortable-hoc'; +import {Button, IconButton, Dropdown} from 'superdesk-ui-framework/react'; +import {groupBy} from 'lodash'; +import {querySelectorParent} from 'core/helpers/dom/querySelectorParent'; +import ng from 'core/services/ng'; +import {getLabelForFieldId} from 'apps/workspace/helpers/getLabelForFieldId'; +import {getContentProfileFormConfig} from './get-content-profiles-form-config'; +import {getEditorConfig} from './get-editor-config'; +import {WidgetsConfig} from './WidgetsConfig'; + +// should be stored in schema rather than editor section of the content profile +// but the fields should be editable via GUI +enum ISchemaFields { + readonly = 'readonly', + required = 'required', + minlength = 'minlength', + maxlength = 'maxlength', +} + +const allSchemaFieldKeys: Array = + Object.keys(ISchemaFields).map((key) => ISchemaFields[key]); + +function isSchemaKey(x: string): x is keyof typeof ISchemaFields { + return ISchemaFields[x] != null; +} + +type ISchemaKey = keyof typeof ISchemaFields; + +// this is UI specific data structure +// when saving, data from it will be converted and written to schema/editor sections of the content profile +type IContentProfileField = valueof & {id: string} & {[key in ISchemaKey]?: any}; + +interface IAdditionalProps { + additionalProps: { + sortingInProgress: boolean; + setIndexForNewItem(index: number): void; + getLabel(id: string): string; + availableIds: Array<{id: string; label: string}>; + }; +} + +interface IProps { + profile: IContentProfile; + profileType: keyof typeof IContentProfileType; + patchContentProfile(patch: Partial): void; +} + +interface IState { + fields: {[key in IContentProfileSection]: Array} | null; + allFieldIds: Array | null; + selectedSection: keyof typeof IContentProfileSection; + activeTab: IState['selectedSection'] | 'widgets'; + sortingInProgress: boolean; + insertNewItemAtIndex: number | null; + vocabularies: Array; + editor: IContentProfileEditorConfig | null; + schema: any | null; + customFields: any | null; + loading: boolean; +} + +enum IContentProfileSection { + header = 'header', + content = 'content', +} + +function getAllContentProfileSections(): Array { + return Object.keys(IContentProfileSection).map((key) => IContentProfileSection[key]); +} + +function getTabs(): Array<{label: string, value: IState['activeTab']}> { + return [ + ...getAllContentProfileSections().map((section) => ({ + label: getLabelForSection(section), + value: section, + })), + {label: gettext('Widgets'), value: 'widgets'}, + ]; +} + +function getLabelForSection(section: IContentProfileSection) { + if (section === IContentProfileSection.header) { + return gettext('Header fields'); + } else if (section === IContentProfileSection.content) { + return gettext('Content fields'); + } else { + return assertNever(section); + } +} + +type IPropsItem = IPropsGenericFormItemComponent & IAdditionalProps; + +// wrapper is used because sortable HOC considers `index` to be its internal prop and doesn't forward it +class ItemBase extends React.PureComponent<{wrapper: IPropsItem}> { + render() { + const {item, page, index, inEditMode} = this.props.wrapper; + const {sortingInProgress, setIndexForNewItem, getLabel, availableIds} = this.props.wrapper.additionalProps; + const isLast = index === page.getItemsCount() - 1; + + const newFieldSelect = (newItemIndex) => ( + ({ + label: label, + onSelect: () => { + setIndexForNewItem(newItemIndex); + page.openNewItemForm({_id: id}); + }, + }))} + > + + )) + } +
+ ); + + if (this.state.activeTab === 'widgets') { + return ( + + {tabs} + +
+ { + this.props.patchContentProfile({ + widgets_config, + }); + }} + /> +
+ + ); + } else { + const {sortingInProgress} = this.state; + const fields = this.state.fields[this.state.selectedSection]; + + const fieldsResponse: ICrudManagerResponse = { + _items: fields.map((field) => ({...field, _id: field.id})), + _meta: {total: fields.length, page: 1, max_results: fields.length}, + }; + + const crudManagerForContentProfileFields: ICrudManager = { + activeFilters: {}, + read: () => Promise.resolve(fieldsResponse), + update: (item) => { + const itemWithId = {...item, id: item._id}; + + return new Promise((resolve) => { + this.setState( + { + fields: this.updateCurrentFields( + (_fields) => { + return _fields.map((field) => { + if (field.id === itemWithId._id) { + return stripSystemId(itemWithId); + } else { + return field; + } + }); + }, + ), + }, + () => { + resolve(item); + }, + ); + }); + }, + create: (item) => { + if (item._id == null) { + throw new Error('id must be provided'); + } + + return new Promise((resolve) => { + const itemWithId: IContentProfileFieldWithSystemId = { + ...item, + _id: item._id, + id: item._id, + }; + + this.setState( + { + insertNewItemAtIndex: null, + fields: this.updateCurrentFields( + (_fields) => { + return arrayInsert( + _fields, + stripSystemId(itemWithId), + this.state.insertNewItemAtIndex ?? 0, + ); + }, + ), + }, + () => { + resolve(itemWithId); + }, + ); + }); + }, + delete: (item) => { + return new Promise((resolve) => { + this.setState( + { + fields: this.updateCurrentFields( + (_fields) => _fields.filter( + (field) => field.id !== item._id, + ), + ), + }, + () => { + resolve(); + }, + ); + }); + }, + refresh: () => Promise.resolve(fieldsResponse), + sort: () => Promise.resolve(fieldsResponse), + removeFilter: () => Promise.resolve(fieldsResponse), + goToPage: () => Promise.resolve(fieldsResponse), + _items: fieldsResponse._items, + _meta: fieldsResponse._meta, + }; + + const getLabel = (id) => { + return this.state.editor[id]?.field_name ?? getLabelForFieldId(id, this.state.vocabularies); + }; + + const availableIds: Array<{id: string; label: string}> = this.state.allFieldIds + .filter((id) => { + return ( + this.isAllowedForSection(this.state.selectedSection, id) + && !this.existsInFields(id) + ); + }) + .map((id) => ({id, label: getLabel(id)})); + + return ( +
+ {tabs} + + { + return getContentProfileFormConfig( + this.state.editor, + this.state.schema, + this.state.customFields, + item, + ); + }} + ItemComponent={ItemComponent} + ItemsContainerComponent={this.ItemsContainerComponent} + items={crudManagerForContentProfileFields} + additionalProps={{ + sortingInProgress, + availableIds, + setIndexForNewItem: (index) => { + this.setState({insertNewItemAtIndex: index}); + }, + getLabel, + }} + disallowFiltering + disallowCreatingNewItem + contentMargin={0} + /> +
+ ); + } + } +} diff --git a/scripts/apps/workspace/content/components/get-content-profiles-form-config.tsx b/scripts/apps/workspace/content/components/get-content-profiles-form-config.tsx new file mode 100644 index 0000000000..fcd82d810e --- /dev/null +++ b/scripts/apps/workspace/content/components/get-content-profiles-form-config.tsx @@ -0,0 +1,346 @@ +import {FormFieldType} from 'core/ui/components/generic-form/interfaces/form'; +import { + IFormField, + IFormGroup, + IContentProfileEditorConfig, + FORMATTING_OPTION, + PLAINTEXT_FORMATTING_OPTION, + RICH_FORMATTING_OPTION, +} from 'superdesk-api'; +import {gettext} from 'core/utils'; +import {IContentProfileFieldWithSystemId} from './ContentProfileFieldsConfig'; +import {appConfig} from 'appConfig'; + +const HAS_PLAINTEXT_FORMATTING_OPTIONS = Object.freeze({ + headline: true, +}); + +const HAS_RICH_FORMATTING_OPTIONS = Object.freeze({ + abstract: true, + body_html: true, + footer: true, + body_footer: true, +}); + +const FORMATTING_OPTIONS: Array = [ + 'h1', + 'h2', + 'h3', + 'h4', + 'h5', + 'h6', + 'justifyLeft', + 'justifyCenter', + 'justifyRight', + 'justifyFull', + 'outdent', + 'indent', + 'unordered list', + 'ordered list', + 'pre', + 'quote', + 'media', + 'link', + 'superscript', + 'subscript', + 'strikethrough', + 'underline', + 'italic', + 'bold', + 'table', +]; + +const EDITOR3_PLAINTEXT_FORMATTING_OPTIONS: Array = [ + 'uppercase', + 'lowercase', +]; + +const EDITOR3_RICH_FORMATTING_OPTIONS: Array = [ + ...EDITOR3_PLAINTEXT_FORMATTING_OPTIONS, + 'h1', + 'h2', + 'h3', + 'h4', + 'h5', + 'h6', + 'ordered list', + 'unordered list', + 'quote', + 'media', + 'link', + 'embed', + 'underline', + 'italic', + 'bold', + 'table', + 'formatting marks', + 'remove format', + 'remove all format', + 'annotation', + 'comments', + 'suggestions', + 'pre', + 'superscript', + 'subscript', + 'strikethrough', + 'tab', + 'tab as spaces', + 'undo', + 'redo', +]; + +export const formattingOptionsUnsafeToParseFromHTML: Array = [ + // these aren't outputted to HTML at all + 'comments', + 'suggestions', + + // no standard in HTML, parsing according to our output format is not implemented + 'annotation', + + // may not be parsed well + 'pre', + 'embed', + 'media', + 'table', +]; + +function hasFormattingOptions(fieldId: string, editor, customFields: Array) { + return Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(fieldId) + || ( + editor?.body_html?.editor3 === true + && Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(fieldId) + ) + || customFields.find(({_id}) => fieldId === _id)?.field_type === 'text'; +} + +function getEditor3FormattingOptions(fieldId, customFields: Array) { + const isCustomPlainTextField = customFields.find(({_id}) => fieldId === _id)?.field_type === 'text'; + + if (Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(fieldId) || isCustomPlainTextField) { + return EDITOR3_RICH_FORMATTING_OPTIONS; + } else { + return EDITOR3_PLAINTEXT_FORMATTING_OPTIONS; + } +} + +export function getContentProfileFormConfig( + editor: IContentProfileEditorConfig, + schema: any, + customFields: Array, + field?: Partial | undefined, +): IFormGroup { + const customField = field?.id != null ? customFields.find(({_id}) => field.id === _id) : null; + + const sdWidthField: IFormField = { + label: gettext('Width'), + type: FormFieldType.select, + component_parameters: { + options: [ + {id: 'full', label: gettext('Full')}, + {id: 'half', label: gettext('Half')}, + {id: 'quarter', label: gettext('Quarter')}, + ], + style: {boxed: true}, + }, + field: 'sdWidth', + required: true, + }; + + const requiredField: IFormField = { + label: gettext('Required'), + type: FormFieldType.checkbox, + field: 'required', + required: false, + }; + + const readonlyField: IFormField = { + label: gettext('Read-only'), + type: FormFieldType.checkbox, + field: 'readonly', + required: false, + }; + + const fields: Array = [ + requiredField, + readonlyField, + sdWidthField, + ]; + + if ( + field?.id != null + && ( + schema[field.id].type === 'string' + || customField?.field_type === 'text' + ) + ) { + const minimumLengthField: IFormField = { + label: gettext('Minimum length'), + type: FormFieldType.number, + field: 'minlength', + required: false, + component_parameters: { + style: {boxed: true}, + }, + }; + + const maximumLengthField: IFormField = { + label: gettext('Maximum length'), + type: FormFieldType.number, + field: 'maxlength', + required: false, + component_parameters: { + style: {boxed: true}, + }, + }; + + const minMax: IFormGroup = { + direction: 'horizontal', + type: 'inline', + form: [minimumLengthField, maximumLengthField], + }; + + fields.push(minMax); + } + + if (field?.id === 'dateline') { + const hideDateField: IFormField = { + label: gettext('Hide Date'), + type: FormFieldType.checkbox, + field: 'hideDate', + required: false, + }; + + fields.push(hideDateField); + } + + // enable preview config for CVs + // we display other fields by default already + if (field?.id != null && customField != null && customField.field_type == null) { + const showInPreviewField: IFormField = { + label: gettext('Show in preview'), + type: FormFieldType.checkbox, + field: 'preview', + required: false, + }; + + fields.push(showInPreviewField); + } + + if (field?.id != null && schema[field.id]?.type === 'string') { + const cleanPastedHtmlField: IFormField = { + label: gettext('Clean Pasted HTML'), + type: FormFieldType.checkbox, + field: 'cleanPastedHTML', + required: false, + }; + + fields.push(cleanPastedHtmlField); + } + + const characterValidationEnabled = appConfig?.disallowed_characters != null; + + if ( + field?.id != null + && characterValidationEnabled + && ( + schema[field.id]?.type === 'string' + || customField?.field_type === 'text' + ) + ) { + const validateCharactersField: IFormField = { + label: gettext('Validate Characters'), + type: FormFieldType.checkbox, + field: 'validate_characters', + required: false, + }; + + fields.push(validateCharactersField); + } + + const formConfig: IFormGroup = { + direction: 'vertical', + type: 'inline', + form: fields, + }; + + if (field?.id != null && hasFormattingOptions(field.id, editor, customFields)) { + const editor3Enabled = editor?.body_html?.editor3 === true; + + if (editor3Enabled) { + const formattingOptionsEditor3Field: IFormField = { + label: gettext('Formatting options'), + type: FormFieldType.selectMultiple, + field: 'formatOptions', + required: false, + component_parameters: { + items: getEditor3FormattingOptions(field.id, customFields) + .map((option) => ({id: option, label: option})), + }, + }; + + fields.push(formattingOptionsEditor3Field); + } else { + const formattingOptionsEditor2Field: IFormField = { + label: gettext('Formatting options'), + type: FormFieldType.selectMultiple, + field: 'formatOptions', + required: false, + component_parameters: { + items: FORMATTING_OPTIONS.map((option) => ({id: option, label: option})), + }, + }; + + fields.push(formattingOptionsEditor2Field); + } + } + + if (field?.id != null && field.id === 'feature_media' && schema[field.id].type === 'media') { + const showCropsField: IFormField = { + label: gettext('Show Crops'), + type: FormFieldType.checkbox, + field: 'showCrops', + required: false, + }; + + fields.push(showCropsField); + } + + if ( + field?.id != null + && ( + schema[field.id].type === 'media' + || ( + hasFormattingOptions(field.id, editor, customFields) + && field.formatOptions?.includes('media') === true + ) + ) + ) { + const showImageTitleField: IFormField = { + label: gettext('Show Image Title'), + type: FormFieldType.checkbox, + field: 'imageTitle', + required: false, + }; + + fields.push(showImageTitleField); + } + + if (field?.id === 'sms') { + const prefillSmsField: IFormField = { + label: gettext('Prefill the field with text from:'), + type: FormFieldType.select, + component_parameters: { + options: [ + {id: '', label: gettext('Abstract')}, + {id: 'headline', label: gettext('Headline')}, + ], + }, + field: 'sourceField', + required: false, + }; + + fields.push(prefillSmsField); + } + + return formConfig; +} diff --git a/scripts/apps/workspace/content/components/get-editor-config.tsx b/scripts/apps/workspace/content/components/get-editor-config.tsx new file mode 100644 index 0000000000..434015da6d --- /dev/null +++ b/scripts/apps/workspace/content/components/get-editor-config.tsx @@ -0,0 +1,113 @@ +import ng from 'core/services/ng'; +import {assertNever} from 'core/helpers/typescript-helpers'; +import {IContentProfileEditorConfig, IArticle} from 'superdesk-api'; +import {getFields} from 'apps/fields'; + +export const ARTICLE_HEADER_FIELDS = new Set([ + 'keywords', + 'genre', + 'anpa_take_key', + 'place', + 'language', + 'priority', + 'urgency', + 'anpa_category', + 'subject', + 'company_codes', + 'ednote', + 'authors', +]); + +export const ARTICLE_COMMON_FIELDS = new Set([ + 'slugline', +]); + +export const getArticleHeaderFields = (customVocabulariesForArticleHeader): Set => { + const articleHeaderFields = new Set(); + + ARTICLE_HEADER_FIELDS.forEach((id) => { + articleHeaderFields.add(id); + }); + + customVocabulariesForArticleHeader.forEach((filteredCustomField) => { + articleHeaderFields.add(filteredCustomField._id); + }); + + return articleHeaderFields; +}; + +const getArticleCommonFields = (customTextAndDateVocabularies, customFields): Set => { + const articleCommonFields = new Set(); + + ARTICLE_COMMON_FIELDS.forEach((id) => { + articleCommonFields.add(id); + }); + + const fieldsFromExtensions = Object.keys(getFields()); + + customFields.forEach((customField) => { + if ( + customField.custom_field_type != null + && fieldsFromExtensions.includes(customField.custom_field_type) + ) { + articleCommonFields.add(customField._id); + } + }); + + customTextAndDateVocabularies.forEach((filteredCustomField) => { + articleCommonFields.add(filteredCustomField._id); + }); + + return articleCommonFields; +}; + +export function getEditorConfig(contentTypeId) { + const content = ng.get('content'); + const metadata = ng.get('metadata'); + + return Promise.all([ + content.getCustomFields(), + content.getTypeMetadata(contentTypeId), + ]).then((res) => { + const [customFields, typeMetadata] = res; + + let editor: IContentProfileEditorConfig = angular.extend({}, content.contentProfileEditor); + + editor = angular.extend({}, typeMetadata.editor); + + let schema = angular.extend({}, content.contentProfileSchema); + + schema = angular.extend({}, typeMetadata.schema); + + return metadata.getAllCustomVocabulariesForArticleHeader( + editor, + schema, + ).then(({customVocabulariesForArticleHeader, customTextAndDateVocabularies}) => { + const articleHeaderFields = getArticleHeaderFields(customVocabulariesForArticleHeader); + const articleCommonFields = getArticleCommonFields(customTextAndDateVocabularies, customFields); + + for (const key in editor) { + const isHeaderField = articleHeaderFields.has(key) || articleCommonFields.has(key); + const section = editor[key].section || (isHeaderField ? 'header' : 'content'); + + if (editor[key] != null) { + editor[key].section = section; + } + } + + return { + editor, + schema, + isAllowedForSection: (section: 'header' | 'content', fieldId) => { + if (section === 'header') { + return articleHeaderFields.has(fieldId) || articleCommonFields.has(fieldId); + } else if (section === 'content') { + return !articleHeaderFields.has(fieldId); + } else { + return assertNever(section); + } + }, + }; + }); + }); +} diff --git a/scripts/apps/workspace/content/constants.ts b/scripts/apps/workspace/content/constants.ts index 4acafaaf5c..23f4588fe0 100644 --- a/scripts/apps/workspace/content/constants.ts +++ b/scripts/apps/workspace/content/constants.ts @@ -1,67 +1,6 @@ import {gettext} from 'core/utils'; import {IStage} from 'superdesk-api'; import {ICard} from 'apps/monitoring/services/CardsService'; -import {SplitFilter} from 'apps/monitoring/filters'; - -// http://docs.python-cerberus.org/en/stable/usage.html -export const DEFAULT_SCHEMA = Object.freeze({ - slugline: {maxlength: 24, type: 'string', required: true}, - relatedItems: {}, - genre: {type: 'list'}, - anpa_take_key: {type: 'string'}, - place: {type: 'list'}, - priority: {type: 'integer'}, - urgency: {type: 'integer'}, - anpa_category: {type: 'list', required: true}, - subject: {type: 'list', required: true}, - company_codes: {type: 'list'}, - ednote: {type: 'string'}, - headline: {maxlength: 42, type: 'string', required: true}, - sms: {maxlength: 160, type: 'string'}, - abstract: {maxlength: 160, type: 'string'}, - body_html: {required: true, type: 'string'}, - byline: {type: 'string'}, - dateline: {type: 'dict', required: true}, - sign_off: {type: 'string'}, - footer: {}, - body_footer: {type: 'string'}, -}); - -export function GET_DEFAULT_EDITOR() { - const editor3enabled = true; - - return Object.freeze({ - slugline: {order: 1, sdWidth: 'full', enabled: true}, - genre: {order: 2, sdWidth: 'half', enabled: true}, - anpa_take_key: {order: 3, sdWidth: 'half', enabled: true}, - place: {order: 4, sdWidth: 'half', enabled: true}, - priority: {order: 5, sdWidth: 'quarter', enabled: true}, - urgency: {order: 6, sdWidth: 'quarter', enabled: true}, - anpa_category: {order: 7, sdWidth: 'full', enabled: true}, - subject: {order: 8, sdWidth: 'full', enabled: true}, - company_codes: {order: 9, sdWidth: 'full', enabled: true}, - ednote: {order: 10, sdWidth: 'full', enabled: true}, - headline: {order: 11, formatOptions: ['underline', 'link', 'bold'], editor3: editor3enabled, enabled: true}, - sms: {order: 12, enabled: true}, - abstract: { - order: 13, - formatOptions: ['bold', 'italic', 'underline', 'link'], - enabled: true, - editor3: editor3enabled, - }, - byline: {order: 14, enabled: true}, - dateline: {order: 15, enabled: true}, - body_html: { - order: 16, - formatOptions: ['h2', 'bold', 'italic', 'underline', 'quote', 'link', 'embed', 'media'], - enabled: true, - editor3: editor3enabled, - }, - footer: {order: 17, enabled: true}, - body_footer: {order: 18, enabled: true}, - sign_off: {order: 19, enabled: true}, - }); -} // labelMap maps schema entry keys to their display names. export const GET_LABEL_MAP = () => ({ diff --git a/scripts/apps/workspace/content/controllers/ContentProfileFields.ts b/scripts/apps/workspace/content/controllers/ContentProfileFields.ts deleted file mode 100644 index 2f5ffb7abb..0000000000 --- a/scripts/apps/workspace/content/controllers/ContentProfileFields.ts +++ /dev/null @@ -1,208 +0,0 @@ -import {get, keyBy} from 'lodash'; -import {IArticle} from 'superdesk-api'; -import {getLabelForFieldId} from '../../helpers/getLabelForFieldId'; -import {getTypeForFieldId} from '../../helpers/getTypeForFieldId'; -import {getFields} from 'apps/fields'; - -export const ARTICLE_HEADER_FIELDS = new Set([ - 'keywords', - 'genre', - 'anpa_take_key', - 'place', - 'language', - 'priority', - 'urgency', - 'anpa_category', - 'subject', - 'company_codes', - 'ednote', - 'authors', -]); - -export const ARTICLE_COMMON_FIELDS = new Set([ - 'slugline', -]); - -ContentProfileFields.$inject = ['$scope', 'content', 'vocabularies', 'metadata']; -export default function ContentProfileFields($scope, content, vocabularies, metadata) { - this.model = $scope.editing.form; - this.fieldsById = {}; - this.fieldsBySection = {}; - - const getOrder = (field) => get(this.model.editor[field], 'order') || 99; - const isEnabled = (field) => get(this.model.editor[field], 'enabled', false); - - Promise.all([ - content.getCustomFields(), - content.getTypeMetadata(this.model._id), - vocabularies.getVocabularies(), - ]).then((res) => { - const [customFields, typeMetadata, vocabulariesCollection] = res; - - const label = (id) => getLabelForFieldId(id, vocabulariesCollection); - - const getArticleHeaderFields = (customVocabulariesForArticleHeader) => { - const articleHeaderFields = new Set(); - - ARTICLE_HEADER_FIELDS.forEach((id) => { - articleHeaderFields.add(id); - }); - - customVocabulariesForArticleHeader.forEach((filteredCustomField) => { - articleHeaderFields.add(filteredCustomField._id); - }); - - return articleHeaderFields; - }; - - const getArticleCommonFields = (customTextAndDateVocabularies) => { - const articleCommonFields = new Set(); - - ARTICLE_COMMON_FIELDS.forEach((id) => { - articleCommonFields.add(id); - }); - - const fieldsFromExtensions = Object.keys(getFields()); - - customFields.forEach((customField) => { - if ( - customField.custom_field_type != null - && fieldsFromExtensions.includes(customField.custom_field_type) - ) { - articleCommonFields.add(customField._id); - } - }); - - customTextAndDateVocabularies.forEach((filteredCustomField) => { - articleCommonFields.add(filteredCustomField._id); - }); - - return articleCommonFields; - }; - - const initFields = (customVocabulariesForArticleHeader, customTextAndDateVocabularies) => { - this.articleHeaderFields = getArticleHeaderFields(customVocabulariesForArticleHeader); - this.articleCommonFields = getArticleCommonFields(customTextAndDateVocabularies); - - this.enabled = Object.keys(this.model.editor) - .filter(isEnabled) - .sort((a, b) => getOrder(a) - getOrder(b)); - - updateSections(); - }; - - this.model.schema = angular.extend({}, content.contentProfileSchema); - this.model.editor = angular.extend({}, content.contentProfileEditor); - - this.model.schema = angular.extend({}, typeMetadata.schema); - this.model.editor = angular.extend({}, typeMetadata.editor); - this.fieldsById = keyBy(customFields, '_id'); - - metadata.getAllCustomVocabulariesForArticleHeader( - this.model.editor, - this.model.schema, - ).then(({customVocabulariesForArticleHeader, customTextAndDateVocabularies}) => { - initFields(customVocabulariesForArticleHeader, customTextAndDateVocabularies); - }); - - const formatKey = (key: string) => ({ - key: key, - name: this.model.editor[key].field_name || label(key), - type: getTypeForFieldId(key, vocabulariesCollection), - }); - - const updateSections = () => { - this.sections = { - header: { - enabled: [], - available: [], - }, - content: { - enabled: [], - available: [], - }, - }; - - this.enabled.forEach((key, index) => { - const headerField = this.articleHeaderFields.has(key) || this.articleCommonFields.has(key); - const section = this.model.editor[key].section || (headerField ? 'header' : 'content'); - - this.sections[section].enabled.push(key); - this.model.editor[key].order = index + 1; // keep order in sync - // keep required value of editor fields in sync with the schema fields SDNTB-615 - // some keys might be missing from schema but will be present inside editor - // as we store value of some keys inside another key ex: any custom cv is stored inside "subject" - this.model.editor[key].required = this.model.schema[key]?.required ?? false; - }); - - Object.keys(this.model.editor) - .filter((key) => !isEnabled(key)) - .forEach((key) => { - const headerField = this.articleHeaderFields.has(key) || this.articleCommonFields.has(key); - const contentField = this.articleCommonFields.has(key) || !headerField; - - if (headerField) { - this.sections.header.available.push(formatKey(key)); - } - - if (contentField) { - this.sections.content.available.push(formatKey(key)); - } - - this.model.editor[key].order = null; - }); - }; - - const updateModel = (key, editorUpdates, schemaUpdates) => { - const editor = {...this.model.editor}; - const schema = {...this.model.schema}; - - editor[key] = Object.assign({}, editor[key], editorUpdates); - schema[key] = Object.assign({}, schema[key], schemaUpdates); - - this.model.editor = editor; - this.model.schema = schema; - }; - - /** - * @description Disable field in content profile - * @param {String} key the key of the field to toggle. - */ - this.remove = (key) => { - updateModel(key, {enabled: false, section: null}, {enabled: false}); - this.removeEnabled(key); - updateSections(); - }; - - this.add = (key, dest, position, section) => { - updateModel(key, {enabled: true, section: section}, {enabled: true}); - - let destIndex = this.enabled.indexOf(dest); - - if (position === 'after') { - destIndex++; - } - - this.enabled.splice(destIndex, 0, key); - updateSections(); - }; - - this.reorder = (key) => { - this.removeEnabled(key); - this.enabled.splice(this.model.editor[key].order, 0, key); - updateSections(); - }; - - this.drag = (start, end, key) => { - const dest = this.enabled.indexOf(key) + end - start; - - this.removeEnabled(key); - this.enabled.splice(dest, 0, key); - updateSections(); - }; - - this.removeEnabled = (key) => { - this.enabled = this.enabled.filter((_key) => _key !== key); - }; - }); -} diff --git a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts index b4eb2100f5..b623a4a95b 100644 --- a/scripts/apps/workspace/content/controllers/ContentProfilesController.ts +++ b/scripts/apps/workspace/content/controllers/ContentProfilesController.ts @@ -1,12 +1,82 @@ import {cloneDeep, get, isEqual} from 'lodash'; import {gettext} from 'core/utils'; -import {IContentProfile} from 'superdesk-api'; +import {IContentProfile, IRestApiResponse} from 'superdesk-api'; import {appConfig} from 'appConfig'; +import {assertNever, nameof} from 'core/helpers/typescript-helpers'; +import {httpRequestJsonLocal} from 'core/helpers/network'; + +export enum IContentProfileType { + text = 'text', + image = 'image', + audio = 'audio', + video = 'video', + package = 'package', +} + +const allContentProfileTypes: Array = + Object.keys(IContentProfileType).map((key) => IContentProfileType[key]); + +interface IScope extends ng.IScope { + showInfoBubble: boolean; + creating: boolean; + editing: {[key: string]: any}; + new: {[key: string]: any}; + active_only: boolean; + contentTypeFilter: string | null; + ngForm: any; + contentProfileTypes: Array<{ + label: string; + value: string; + disabled: boolean; + icon: string; + }>; + setNgForm(ngForm): void; + patchContentProfile(patch: Partial): void; + getContentProfileIconByProfileType(type: IContentProfile['type']): string; + toggleContentProfileFilter(type: IContentProfile['type']): void; +} + +function getContentProfileIcon(type: IContentProfileType): string { + switch (type) { + case IContentProfileType.text: + return 'icon-text'; + case IContentProfileType.image: + return 'icon-picture'; + case IContentProfileType.audio: + return 'icon-audio'; + case IContentProfileType.video: + return 'icon-video'; + case IContentProfileType.package: + return 'icon-composite'; + default: + return 'icon-text'; + } +} + +function getLabelForContentProfileType(type: IContentProfileType): string { + switch (type) { + case IContentProfileType.text: + return gettext('Text'); + case IContentProfileType.image: + return gettext('Image'); + case IContentProfileType.audio: + return gettext('Audio'); + case IContentProfileType.video: + return gettext('Video'); + case IContentProfileType.package: + return gettext('Package'); + default: + return assertNever(type); + } +} ContentProfilesController.$inject = ['$scope', '$location', 'notify', 'content', 'modal', '$q']; -export function ContentProfilesController($scope, $location, notify, content, modal, $q) { +export function ContentProfilesController($scope: IScope, $location, notify, content, modal, $q) { var self = this; + // info bubble + $scope.showInfoBubble = true; + // creating will be true while the modal for creating a new content // profile is visible. $scope.creating = false; @@ -16,9 +86,7 @@ export function ContentProfilesController($scope, $location, notify, content, mo // be null. $scope.editing = null; - // if true, only active Content Profiles will be shown - // can be changed with a button - $scope.active_only = true; + $scope.active_only = false; // required for being able to mark the form as dirty and enable the save button // after saving content profile widgets config @@ -26,20 +94,35 @@ export function ContentProfilesController($scope, $location, notify, content, mo $scope.ngForm = ngForm; }; - $scope.saveContentProfileWidgetsConfig = (nextWidgetsConfig: IContentProfile['widgets_config']) => { - $scope.editing.form.widgets_config = nextWidgetsConfig; + $scope.patchContentProfile = (patch: Partial) => { + Object.assign($scope.editing.form, patch); + $scope.$applyAsync(() => { $scope.ngForm.$dirty = true; }); }; + $scope.getContentProfileIconByProfileType = (type: IContentProfile['type']) => { + return getContentProfileIcon(IContentProfileType[type]); + }; + + $scope.contentTypeFilter = null; + + $scope.toggleContentProfileFilter = (type: IContentProfile['type']) => { + if ($scope.contentTypeFilter === type) { + $scope.contentTypeFilter = null; + } else { + $scope.contentTypeFilter = type; + } + }; + /** * @description Refreshes the list of content profiles by fetching them. * @returns {Promise} * @private */ function refreshList(callEditActive) { - return content.getTypes(true).then((types) => { + return content.getTypes(null, true).then((types) => { self.items = types; if (callEditActive) { editActive(); @@ -73,6 +156,27 @@ export function ContentProfilesController($scope, $location, notify, content, mo } } + function setContentProfiles() { + $scope.contentProfileTypes = []; // loading + + httpRequestJsonLocal>({ + method: 'GET', + path: '/content_types', + urlParams: { + where: {type: {$ne: 'text'}}, + }, + }).then((res) => { + const existingTypes = new Set(res._items.map((profile) => IContentProfileType[profile.type])); + + $scope.contentProfileTypes = allContentProfileTypes.map((type) => ({ + label: getLabelForContentProfileType(type), + value: type, + disabled: existingTypes.has(type), + icon: getContentProfileIcon(type), + })); + }); + } + /** * @description Reports that an error has occurred. * @private @@ -85,6 +189,12 @@ export function ContentProfilesController($scope, $location, notify, content, mo return $q.reject(resp); } + $scope.$on('resource:updated', (event, data) => { + if (data.resource === 'content_types' && data.fields[nameof('type')] === 1) { + setContentProfiles(); + } + }); + /** * @description Middle-ware that checks an error response to verify whether * it is a duplication error. @@ -129,6 +239,11 @@ export function ContentProfilesController($scope, $location, notify, content, mo * @description Creates a new content profile. */ this.save = function() { + if ($scope.new?.type == null) { + notify.error(gettext('"{{x}}" field is required', {x: 'content type'})); + return; + } + var onSuccess = function(resp) { refreshList(true); self.toggleCreate(); @@ -171,4 +286,5 @@ export function ContentProfilesController($scope, $location, notify, content, mo }; refreshList(true); + setContentProfiles(); } diff --git a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts b/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts deleted file mode 100644 index 943107b632..0000000000 --- a/scripts/apps/workspace/content/directives/ContentProfileSchemaEditor.ts +++ /dev/null @@ -1,227 +0,0 @@ -import {includes} from 'lodash'; -import {getLabelForFieldId} from '../../helpers/getLabelForFieldId'; -import {appConfig} from 'appConfig'; -import {IArticleField, FORMATTING_OPTION, RICH_FORMATTING_OPTION} from 'superdesk-api'; - -interface IScope extends ng.IScope { - getEditor3FormattingOptions: (fieldName: string) => Array; - model: any; - fields: {[key: string]: IArticleField}; - form: any; - formattingOptions: Array; - schemaKeysOrdering: any; - schemaKeysDisabled: any; - characterValidationEnabled: boolean; - hasFormatOptions(field): boolean; - hasImageSelected(field): boolean; - label(id): string; - remove(key: string): void; - toggle(schema: { key: string; }, key: string, position: 'before' | 'after'): void; - reorder(start: number, end: number, key: string): void; - setDirty(): void; - updateOrder(key?: any): void; - onRemove(locals: { key: string; }): void; - onOrderUpdate(locals: { key: string; }): any; - onDrag(locals: { start: number; end: number; key: string; }): any; - onToggle(locals: { key: string; dest: string; position: string; }): any; - showPreviewConfig(field: IArticleField): boolean; -} - -const HAS_PLAINTEXT_FORMATTING_OPTIONS = Object.freeze({ - headline: true, -}); - -const HAS_RICH_FORMATTING_OPTIONS = Object.freeze({ - abstract: true, - body_html: true, - footer: true, - body_footer: true, -}); - -const FORMATTING_OPTIONS: Array = [ - 'h1', - 'h2', - 'h3', - 'h4', - 'h5', - 'h6', - 'justifyLeft', - 'justifyCenter', - 'justifyRight', - 'justifyFull', - 'outdent', - 'indent', - 'unordered list', - 'ordered list', - 'pre', - 'quote', - 'media', - 'link', - 'superscript', - 'subscript', - 'strikethrough', - 'underline', - 'italic', - 'bold', - 'table', -]; - -export type PLAINTEXT_FORMATTING_OPTION = 'uppercase' | 'lowercase'; - -const EDITOR3_PLAINTEXT_FORMATTING_OPTIONS: Array = [ - 'uppercase', - 'lowercase', -]; - -export const formattingOptionsUnsafeToParseFromHTML: Array = [ - // these aren't outputted to HTML at all - 'comments', - 'suggestions', - - // no standard in HTML, parsing according to our output format is not implemented - 'annotation', - - // may not be parsed well - 'pre', - 'embed', - 'media', - 'table', -]; - -const EDITOR3_RICH_FORMATTING_OPTIONS: Array = [ - ...EDITOR3_PLAINTEXT_FORMATTING_OPTIONS, - 'h1', - 'h2', - 'h3', - 'h4', - 'h5', - 'h6', - 'ordered list', - 'unordered list', - 'quote', - 'media', - 'link', - 'embed', - 'underline', - 'italic', - 'bold', - 'table', - 'formatting marks', - 'remove format', - 'remove all format', - 'annotation', - 'comments', - 'suggestions', - 'pre', - 'superscript', - 'subscript', - 'strikethrough', - 'tab', - 'tab as spaces', - 'undo', - 'redo', -]; - -/** - * @ngdoc directive - * @module superdesk.apps.workspace - * @name ContentProfileSchemaEditor - * - * @requires content - * - * @description Handles content profile schema editing - */ -ContentProfileSchemaEditor.$inject = ['vocabularies']; -export function ContentProfileSchemaEditor(vocabularies) { - return { - restrict: 'E', - templateUrl: 'scripts/apps/workspace/content/views/schema-editor.html', - require: '^form', - scope: { - model: '=', - fields: '=', - available: '=', - enabled: '=', - onRemove: '&', - onToggle: '&', - onOrderUpdate: '&', - onDrag: '&', - }, - link: function(scope: IScope, elem, attr, form) { - scope.formattingOptions = FORMATTING_OPTIONS; - scope.characterValidationEnabled = appConfig?.disallowed_characters != null; - - scope.getEditor3FormattingOptions = (fieldName) => { - const isCustomPlainTextField = typeof scope.fields[fieldName] === 'object' - && scope.fields[fieldName].field_type === 'text'; - - if (Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(fieldName) || isCustomPlainTextField) { - return EDITOR3_RICH_FORMATTING_OPTIONS; - } else { - return EDITOR3_PLAINTEXT_FORMATTING_OPTIONS; - } - }; - - scope.remove = (key) => { - scope.onRemove({key}); - scope.setDirty(); - }; - - scope.toggle = (schema, key, position) => { - scope.onToggle({key: schema.key, dest: key, position: position}); - scope.setDirty(); - }; - - scope.updateOrder = (key) => { - scope.onOrderUpdate({key}); - scope.setDirty(); - }; - - scope.reorder = (start, end, key) => { - scope.onDrag({start, end, key}); - scope.setDirty(); - }; - - scope.setDirty = () => { - form.$setDirty(); - }; - - /** - * Test if given field should have format options config - * - * @param {string} field - * @return {Boolean} - */ - scope.hasFormatOptions = (field) => - Object.keys(HAS_RICH_FORMATTING_OPTIONS).includes(field) - || Object.keys(HAS_PLAINTEXT_FORMATTING_OPTIONS).includes(field) - || hasCustomFieldFormatOptions(field); - - /** - * Test if given field should have format options config - * - * @param {string} field - * @return {Boolean} - */ - scope.hasImageSelected = (field) => scope.hasFormatOptions(field) && - includes(scope.model.editor[field].formatOptions, 'media'); - - /** - * Test if given field is custom field - * - * @param {string} field - * @return {Boolean} - */ - const hasCustomFieldFormatOptions = (field) => - scope.fields[field] && scope.fields[field].field_type === 'text'; - - vocabularies.getVocabularies().then((vocabulariesCollection) => { - scope.label = (id) => getLabelForFieldId(id, vocabulariesCollection); - }); - - // enable preview config for CVs - // we display other fields by default already - scope.showPreviewConfig = (field) => field != null && field.field_type == null; - }, - }; -} diff --git a/scripts/apps/workspace/content/directives/SortContentProfiles.ts b/scripts/apps/workspace/content/directives/SortContentProfiles.ts deleted file mode 100644 index d25077bd82..0000000000 --- a/scripts/apps/workspace/content/directives/SortContentProfiles.ts +++ /dev/null @@ -1,52 +0,0 @@ -export function SortContentProfiles() { - return { - link: function(scope, element) { - var updated = false; - - element.sortable({ - items: '.schema-item:not(.schema-item__disabled)', - cursor: 'move', - distance: 20, - containment: element, - tolerance: 'pointer', - placeholder: { - element: function(current) { - var height = current.height() - 20; - - return $('
  • ')[0]; - }, - update: function() { /* no-op */ }, - }, - start: function(event, ui) { - ui.item.data('start_index', - ui.item - .parent() - .find('li.schema-item') - .index(ui.item), - ); - }, - stop: function(event, ui) { - if (updated) { - updated = false; - - var start = ui.item.data('start_index'), - end = ui.item.parent().find('li.schema-item') - .index(ui.item), - key = ui.item.data('id'); - - scope.$applyAsync(() => { - scope.reorder(start, end, key); - }); - } - }, - update: function(event, ui) { - updated = true; - }, - }); - - scope.$on('$destroy', () => { - element.sortable('destroy'); - }); - }, - }; -} diff --git a/scripts/apps/workspace/content/directives/index.ts b/scripts/apps/workspace/content/directives/index.ts index 29ecaf3c64..57878b5f06 100644 --- a/scripts/apps/workspace/content/directives/index.ts +++ b/scripts/apps/workspace/content/directives/index.ts @@ -1,4 +1,2 @@ export {ContentCreateDirective} from './ContentCreateDirective'; -export {ContentProfileSchemaEditor} from './ContentProfileSchemaEditor'; export {ItemProfileDirective} from './ItemProfileDirective'; -export {SortContentProfiles} from './SortContentProfiles'; diff --git a/scripts/apps/workspace/content/index.ts b/scripts/apps/workspace/content/index.ts index cd97f1ba33..54f939903b 100644 --- a/scripts/apps/workspace/content/index.ts +++ b/scripts/apps/workspace/content/index.ts @@ -3,10 +3,9 @@ import {reactToAngular1} from 'superdesk-ui-framework'; import {ContentService} from './services'; import * as directive from './directives'; import {coreMenuGroups} from 'core/activity/activity'; -import {WidgetsConfig} from './components/WidgetsConfig'; import {gettext} from 'core/utils'; -import ContentProfileFields from './controllers/ContentProfileFields'; import {ContentProfilesController} from './controllers/ContentProfilesController'; +import {ContentProfileFieldsConfig} from './components/ContentProfileFieldsConfig'; /** * @ngdoc module @@ -26,22 +25,13 @@ angular.module('superdesk.apps.workspace.content', [ .service('content', ContentService) .directive('sdContentCreate', directive.ContentCreateDirective) - .directive('sdContentSchemaEditor', directive.ContentProfileSchemaEditor) .directive('sdItemProfile', directive.ItemProfileDirective) - .directive('sdSortContentProfiles', directive.SortContentProfiles) - - .component('sdWidgetsConfig', reactToAngular1(WidgetsConfig, ['initialWidgetsConfig', 'onUpdate'])) - .component('sdSchemaEditorFieldsDropdown', { - template: require('./views/schema-editor-fields-dropdown.html'), - bindings: { - bottom: '@', - fields: '=', - onSelect: '&', - }, - }) + .component( + 'sdContentProfileFieldsConfig', + reactToAngular1(ContentProfileFieldsConfig, ['profile', 'profileType', 'patchContentProfile']), + ) .controller('ContentProfilesController', ContentProfilesController) - .controller('ContentProfileFields', ContentProfileFields) .config(['superdeskProvider', function(superdesk) { superdesk diff --git a/scripts/apps/workspace/content/services/ContentService.ts b/scripts/apps/workspace/content/services/ContentService.ts index 78f8137ddb..f9003c2a68 100644 --- a/scripts/apps/workspace/content/services/ContentService.ts +++ b/scripts/apps/workspace/content/services/ContentService.ts @@ -4,7 +4,8 @@ import {gettext} from 'core/utils'; import {isMediaEditable} from 'core/config'; import {appConfig} from 'appConfig'; import {dataApi} from 'core/helpers/CrudManager'; -import {IArticle, IContentProfileEditorConfig, IArticleField} from 'superdesk-api'; +import {IVocabulary, IContentProfile} from 'superdesk-api'; +import {IArticle, IContentProfileEditorConfig} from 'superdesk-api'; import {IPackagesService} from 'types/Services/Packages'; import {isMediaType} from 'core/helpers/item'; @@ -165,24 +166,21 @@ export function ContentService(api, templates, desks, packages: IPackagesService * @param {Boolean} includeDisabled * @return {Promise} */ - this.getTypes = function(includeDisabled) { - // eslint-disable-next-line consistent-this - var getTypesFnThis = this; - var params = {}; + this.getTypes = function(type?: IContentProfile['type'] | null, includeDisabled?) { + var params: {where?: any} = {}; if (!includeDisabled) { params = {where: {enabled: true}}; } - // cache when fetching all types - return api.getAll('content_types', params, !!includeDisabled).then((result) => { - getTypesFnThis.types = result.sort((a, b) => b.priority - a.priority, // with higher priority goes up - ); - return getTypesFnThis.types; - }, (reason) => { - getTypesFnThis.types = []; - return getTypesFnThis.types; - }); + if (type != null) { + params.where = params.where ?? {}; + + params.where.type = type; + } + + return api.getAll('content_types', params, !!includeDisabled) + .then((result) => result.sort((a, b) => b.priority - a.priority)); }; /** @@ -191,7 +189,7 @@ export function ContentService(api, templates, desks, packages: IPackagesService * @return {Promise} */ this.getTypesLookup = function() { - return this.getTypes(true).then((profiles) => { + return this.getTypes(null, true).then((profiles) => { var lookup = {}; profiles.forEach((profile) => { @@ -231,11 +229,8 @@ export function ContentService(api, templates, desks, packages: IPackagesService * @param {String} contentType * @return {Object} */ - this.schema = function(profile, contentType) { - const schema = get(profile, 'schema', - get(appConfig.schema, contentType, constant.DEFAULT_SCHEMA)); - - return angular.extend({}, schema); + this.schema = function(profile: IContentProfile, contentType) { + return angular.extend({}, profile.schema); }; /** @@ -245,11 +240,8 @@ export function ContentService(api, templates, desks, packages: IPackagesService * @param {String} contentType * @return {Object} */ - this.editor = function(profile, contentType) { - const editor = get(profile, 'editor', - get(appConfig.editor, contentType, constant.GET_DEFAULT_EDITOR())); - - return angular.extend({}, editor); + this.editor = function(profile: IContentProfile, contentType) { + return angular.extend({}, profile.editor); }; /** @@ -267,7 +259,7 @@ export function ContentService(api, templates, desks, packages: IPackagesService /** * Get fields with preview enabled */ - this.previewFields = (editor: IContentProfileEditorConfig, fields: Array): Array => + this.previewFields = (editor: IContentProfileEditorConfig, fields: Array): Array => editor == null || fields == null ? [] : fields.filter((field) => editor[field._id] != null && editor[field._id].preview); @@ -279,14 +271,14 @@ export function ContentService(api, templates, desks, packages: IPackagesService * @return {Promise} */ this.getDeskProfiles = function(desk, profileId) { - return this.getTypes().then((profiles) => !desk || isEmpty(desk.content_profiles) ? + return this.getTypes('text').then((profiles) => !desk || isEmpty(desk.content_profiles) ? profiles : profiles.filter((profile) => desk.content_profiles[profile._id] || profile._id === profileId), ); }; - this.contentProfileSchema = angular.extend({}, constant.DEFAULT_SCHEMA, constant.EXTRA_SCHEMA_FIELDS); - this.contentProfileEditor = angular.extend({}, constant.GET_DEFAULT_EDITOR(), constant.EXTRA_EDITOR_FIELDS); + this.contentProfileSchema = angular.extend({}, constant.EXTRA_SCHEMA_FIELDS); + this.contentProfileEditor = angular.extend({}, constant.EXTRA_EDITOR_FIELDS); $rootScope.$on('vocabularies:updated', resetFields); @@ -367,29 +359,15 @@ export function ContentService(api, templates, desks, packages: IPackagesService * Setup authoring scope for item */ this.setupAuthoring = (profileId, scope, item) => { - if (profileId) { - return this.getType(profileId).then((profile) => { - scope.schema = this.schema(profile, item.type); - scope.editor = this.editor(profile, item.type); - scope.fields = this.fields(profile); - return profile; - }); - } else { - return this.getCustomFields().then(() => { - scope.schema = this.schema(null, get(item, 'type', 'text')); - scope.editor = this.editor(null, get(item, 'type', 'text')); - - // sign_off field used to always be hidden for media items in authoring, but was visible in preview - // to fix the inconsistency, I am making it read only so it's displayed in both places, - // but not editable, to keep it similar to past behaviour. - // In the future when we drop support for default profiles, this setting should be applied to - // customer configurations and removed from here. - if (isMediaType(item) && scope.schema.sign_off != null) { - scope.schema.sign_off.readonly = true; - } - - scope.fields = this.fields({editor: scope.editor}); - }); + if (profileId == null) { + throw new Error('profile ID must be provided'); } + + return this.getType(profileId).then((profile) => { + scope.schema = this.schema(profile, item.type); + scope.editor = this.editor(profile, item.type); + scope.fields = this.fields(profile); + return profile; + }); }; } diff --git a/scripts/apps/workspace/content/styles/profiles.scss b/scripts/apps/workspace/content/styles/profiles.scss index ef29f056c6..6e0f9461cb 100644 --- a/scripts/apps/workspace/content/styles/profiles.scss +++ b/scripts/apps/workspace/content/styles/profiles.scss @@ -11,10 +11,7 @@ sd-content-schema-editor { ul.pills-list { padding-top: 10px; - .vocabulary-field-type { - font-weight: 300; - font-style: italic; - } + > li { padding: 20px; margin-bottom: 12px; diff --git a/scripts/apps/workspace/content/tests/content.spec.ts b/scripts/apps/workspace/content/tests/content.spec.ts index 65e7ccffd3..e1d6bfca23 100644 --- a/scripts/apps/workspace/content/tests/content.spec.ts +++ b/scripts/apps/workspace/content/tests/content.spec.ts @@ -76,7 +76,6 @@ describe('superdesk.apps.workspace.content', () => { $rootScope.$digest(); expect(api.getAll).toHaveBeenCalledWith('content_types', {where: {enabled: true}}, false); expect(success).toHaveBeenCalledWith(types); - expect(content.types).toBe(types); })); it('can fetch content types and filter by desk', inject((content, $rootScope, $q) => { @@ -123,33 +122,6 @@ describe('superdesk.apps.workspace.content', () => { expect(success).toHaveBeenCalledWith(type); })); - it('can get schema for content type', inject((content) => { - var schema = content.schema(); - - expect(schema.headline).toBeTruthy(); - expect(schema.slugline).toBeTruthy(); - expect(schema.body_html).toBeTruthy(); - - var contentType = {schema: {foo: 1}}; - - schema = content.schema(contentType); - expect(schema.headline).toBeFalsy(); - expect(schema.foo).toBeTruthy(); - expect(schema).not.toBe(content.schema(contentType)); // check it is a copy - })); - - it('can get editor config for content type', inject((content) => { - var editor = content.editor(); - - expect(editor.slugline.order).toBe(1); - - var contentType = {editor: {foo: 2}}; - - editor = content.editor(contentType); - expect(editor.foo).toBe(2); - expect(editor.slugline).toBeFalsy(); - })); - it('can filter custom fields per profile', inject((content) => { content._fields = [ {_id: 'foo'}, @@ -173,7 +145,7 @@ describe('superdesk.apps.workspace.content', () => { var ctrl = $controller('ContentProfilesController', {$scope: scope}); scope.$digest(); - expect(content.getTypes).toHaveBeenCalledWith(true); + expect(content.getTypes).toHaveBeenCalledWith(null, true); expect(ctrl.items).toBe('list'); })); diff --git a/scripts/apps/workspace/content/views/profile-settings.html b/scripts/apps/workspace/content/views/profile-settings.html index 4ab89f78e3..732b6de138 100644 --- a/scripts/apps/workspace/content/views/profile-settings.html +++ b/scripts/apps/workspace/content/views/profile-settings.html @@ -5,9 +5,22 @@

    Content Profiles

    - - {{:: 'All'| translate}} - {{:: 'Active only'| translate}} + +
    +
    + +
    +
    + + + + +
    -
    {{ type.label}}
    +
    + + {{ type.label}} +
      @@ -60,16 +77,43 @@

      Add New Content Profile

    +
    +

    + + Please note that only one content profile per content type other than text is allowed. If the content type is disabled, the limit is already reached. +

    + + + + +
    +
    -
    -
    +
    +
    + +
    + + + +
    +
    +
    +
    +
    Please use less than 40 characters
    -
    -
    +
    +
    @@ -88,56 +132,43 @@

    Add New Content Profile

    {{ :: 'Editing' | translate }} "{{ editing.form.label}}"

    -
    +
    -
    -
    - - -
    Please use less than 40 characters
    +
    +
    + +
    +
    +
    + + +
    Please use less than 40 characters
    +
    -
    -
    +
    +
    - +
    -
    - +
    +
    + +
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    +
    +
    diff --git a/scripts/apps/workspace/content/views/schema-editor-fields-dropdown.html b/scripts/apps/workspace/content/views/schema-editor-fields-dropdown.html deleted file mode 100644 index 1421ec13a6..0000000000 --- a/scripts/apps/workspace/content/views/schema-editor-fields-dropdown.html +++ /dev/null @@ -1,17 +0,0 @@ -
    - -
      -
    • - -
      • -
    • -
        -
      • - -
        • -
      -
      • -
    -
    \ No newline at end of file diff --git a/scripts/apps/workspace/content/views/schema-editor.html b/scripts/apps/workspace/content/views/schema-editor.html deleted file mode 100644 index b45498ab9a..0000000000 --- a/scripts/apps/workspace/content/views/schema-editor.html +++ /dev/null @@ -1,119 +0,0 @@ -
    - -
    - -
    - -
      -
    • - - -
      - {{ :: model.editor[id].field_name || label(id) | translate}} - -
      -
      -
      -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - - -
      - -
      - -
      - min: - - max: - - Min length shouldn't be bigger than max length. - Max length should be bigger than 0 or empty. -
      -
      - -
      - - -
      - -
      - -
      -
      - -
      - -
      -
      - -
      - -
      -
      - - -
      - -
      -
      -
      - - -
      - -
      -
      - -
      - -
      -
      - -
      - -   - -
      - -
      -
      - -
      - -
      -
      • -
    -
    diff --git a/scripts/apps/workspace/helpers/getTypeForFieldId.ts b/scripts/apps/workspace/helpers/getTypeForFieldId.ts index 5d128a4e24..517806a14e 100644 --- a/scripts/apps/workspace/helpers/getTypeForFieldId.ts +++ b/scripts/apps/workspace/helpers/getTypeForFieldId.ts @@ -1,7 +1,7 @@ -import {IArticleField} from 'superdesk-api'; +import {IVocabulary} from 'superdesk-api'; import {gettext} from 'core/utils'; -export const getLabelForType = (fieldType: IArticleField['field_type']) => { +export const getLabelForType = (fieldType: IVocabulary['field_type']) => { const TYPE_LABEL = { text: gettext('text'), media: gettext('related content'), @@ -17,7 +17,7 @@ export const getLabelForType = (fieldType: IArticleField['field_type']) => { return gettext('custom vocabulary'); }; -export const getTypeForFieldId = (fieldId, vocabularies: Array) => { +export const getTypeForFieldId = (fieldId, vocabularies: Array) => { const vocabulary = vocabularies.find((obj) => obj._id === fieldId); if (vocabulary && vocabulary.field_type) { diff --git a/scripts/core/editor3/store/index.ts b/scripts/core/editor3/store/index.ts index cc0a4045e3..7c7bc3b0e0 100644 --- a/scripts/core/editor3/store/index.ts +++ b/scripts/core/editor3/store/index.ts @@ -36,8 +36,10 @@ import { ISpellcheckWarningsByBlock, } from '../components/spellchecker/SpellcheckerDecorator'; import {appConfig} from 'appConfig'; +import { + formattingOptionsUnsafeToParseFromHTML, +} from 'apps/workspace/content/components/get-content-profiles-form-config'; import {RICH_FORMATTING_OPTION} from 'superdesk-api'; -import {formattingOptionsUnsafeToParseFromHTML} from 'apps/workspace/content/directives/ContentProfileSchemaEditor'; import { CharacterLimitUiBehavior, DEFAULT_UI_FOR_EDITOR_LIMIT, diff --git a/scripts/core/helpers/CrudManager.tsx b/scripts/core/helpers/CrudManager.tsx index 4855c103ba..0b6cf63ce7 100644 --- a/scripts/core/helpers/CrudManager.tsx +++ b/scripts/core/helpers/CrudManager.tsx @@ -339,6 +339,7 @@ export function connectCrudManager name: string, endpoint: string, + defaultSortOption?: ISortOption, formatFiltersForServer?: (filters: ICrudManagerFilters) => ICrudManagerFilters, ): React.ComponentType { const component = class extends React.Component> @@ -353,8 +354,7 @@ export function connectCrudManager { if (options.urlParams != null) { Object.keys(options.urlParams).forEach((key) => { - _url.searchParams.append(key, options.urlParams[key]); + const value = options.urlParams[key]; + const stringified = typeof value === 'string' + ? value + : JSON.stringify(value); + + _url.searchParams.append(key, stringified); }); } diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index 1b04b89fec..a7c608d086 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -18,6 +18,8 @@ declare module 'superdesk-api' { export type Omit = Pick>; + export type IArrayKeyed = Array<{key: string; value: T}>; + export type ICallable = (...args: Array) => any; @@ -689,15 +691,42 @@ declare module 'superdesk-api' { disable_entire_category_selection?: boolean; } - export interface IArticleField extends IVocabulary { - single?: boolean; - preview?: boolean; - } + export type IContentProfileEditorConfig = { + [key: string]: { + single?: boolean; + enabled?: boolean; + order: number; + field_name?: string; + section?: 'header' | 'content'; + editor3?: boolean; // only for body_html + required?: boolean; + readonly?: boolean; + sdWidth?: 'full' | 'half' | 'quarter'; + minlength?: number; + maxlength?: number; + hideDate?: boolean; + preview?: boolean; + cleanPastedHTML?: boolean; + validate_characters?: boolean; + formatOptions?: Array; + showCrops?: boolean; + imageTitle?: boolean; + sourceField?: string; + } + }; - export type IContentProfileEditorConfig = {[key: string]: IArticleField}; + export enum IContentProfileType { + text = 'text', + image = 'image', + audio = 'audio', + video = 'video', + package = 'package', + } export interface IContentProfile { _id: string; + type: keyof typeof IContentProfileType; + type: 'text'; label: string; description: string; schema: Object; @@ -706,8 +735,8 @@ declare module 'superdesk-api' { priority: number; enabled: boolean; is_used: boolean; - created_by: string; - updated_by: string; + created_by: IUser['_id']; + updated_by: IUser['_id']; } export interface IMedia { @@ -729,7 +758,6 @@ declare module 'superdesk-api' { } - // PAGE export type IPage = DeepReadonly<{ @@ -879,25 +907,49 @@ declare module 'superdesk-api' { // GENERIC FORM - export interface IPropsGenericForm> { - formConfig: IFormGroup; - defaultSortOption: ISortOption; - defaultFilters?: Partial; - renderRow(key: string, item: T, page: IGenericListPageComponent): JSX.Element; + export interface IPropsGenericFormContainer { + page: IGenericListPageComponent; + } + + export interface IPropsGenericFormItemComponent { + item: T; + page: IGenericListPageComponent; + inEditMode: boolean; + index: number; + } + + export interface IPropsGenericForm { + getFormConfig(item?: Partial): IFormGroup; + additionalSortOptions?: Array<{label: string; field: string;}>; + additionalProps?: P; // allows passing props which will be available in container and item components + defaultFilters?: Partial; + ItemComponent: React.ComponentType & {additionalProps?: P}>; + ItemsContainerComponent?: React.ComponentType & {additionalProps?: P}>; // Allows initializing a new item with some fields already filled. - getNewItemTemplate?(page: IGenericListPageComponent): Partial; + getNewItemTemplate?(page: IGenericListPageComponent): Partial; refreshOnEvents?: Array; fieldForSearch?: IFormField; // must be present in formConfig disallowCreatingNewItem?: true; disallowFiltering?: true; + + /** + * Dynamic schema is supported in order to display additional fields depending on values of current fields. + * All fields are removed which aren't present in the schema at the time of saving. + * In some cases it is desirable to maintain a field even if it is not in the schema. + */ + hiddenFields?: Array; + + // styles + contentMargin?: number; } export enum FormFieldType { - textSingleLine = 'textSingleLine', + plainText = 'plainText', textEditor3 = 'textEditor3', + number = 'number', vocabularySingleValue = 'vocabularySingleValue', checkbox = 'checkbox', contentFilterSingleValue = 'contentFilterSingleValue', @@ -906,6 +958,7 @@ declare module 'superdesk-api' { macroSingleValue = 'macroSingleValue', yesNo = 'yesNo', select = 'select', + selectMultiple = 'selectMultiple', } export interface IFormField { // don't forget to update runtime type checks @@ -946,29 +999,41 @@ declare module 'superdesk-api' { direction: 'ascending' | 'descending'; } + export interface IItemWithId { + _id: string; + } + + export interface ICrudManagerResponse { + _items: Array; + _meta: { + max_results: number; + page: number; + total: number; + }; + } - export interface ICrudManagerState extends IRestApiResponse { + export interface ICrudManagerState extends ICrudManagerResponse { activeFilters: ICrudManagerFilters; activeSortOption?: ISortOption; } - export interface ICrudManagerMethods { + export interface ICrudManagerMethods { read( page: number, sort: ISortOption, filterValues?: ICrudManagerFilters, - ): Promise>; + ): Promise>; update(item: Entity): Promise; create(item: Entity): Promise; delete(item: Entity): Promise; - refresh(): Promise>; - sort(nextSortOption: ISortOption): Promise>; - removeFilter(fieldName: string): Promise>; - goToPage(nextPage: number): Promise>; + refresh(): Promise>; + sort(nextSortOption: ISortOption): Promise>; + removeFilter(fieldName: string): Promise>; + goToPage(nextPage: number): Promise>; } - export interface ICrudManager extends ICrudManagerState, ICrudManagerMethods { + export interface ICrudManager extends ICrudManagerState, ICrudManagerMethods { // allow exposing it as one interface for consumer components } @@ -1068,17 +1133,18 @@ declare module 'superdesk-api' { flex?: boolean; } - export interface IGenericListPageComponent> { + export interface IGenericListPageComponent { openPreview(id: string): void; startEditing(id: string): void; closePreview(): void; setFiltersVisibility(nextValue: boolean): void; handleFilterFieldChange(field: string, nextValue: any, callback): void; - openNewItemForm(): void; + openNewItemForm(initialValues?: {[key: string]: any}): void; closeNewItemForm(): void; deleteItem(item: T): void; - getActiveFilters(): Partial; + getActiveFilters(): Partial; removeFilter(fieldName: string): void; + getItemsCount(): number; } export interface IPropsSelectUser { @@ -1669,11 +1735,17 @@ declare module 'superdesk-api' { }, components: { UserHtmlSingleLine: React.ComponentType<{html: string}>; - getGenericListPageComponent(resource: string, formConfig: IFormGroup): React.ComponentType>; + getGenericListPageComponent( + resource: string, + formConfig: IFormGroup, + defaultSortOption?: ISortOption, + additionalProps?: P, + ): React.ComponentType>; connectCrudManager( WrappedComponent: React.ComponentType, name: string, endpoint: string, + defaultSortOption?: ISortOption, formatFiltersForServer?: (filters: ICrudManagerFilters) => ICrudManagerFilters, ): React.ComponentType; ListItem: React.ComponentType; diff --git a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx index c10c97fe86..0190f5c91d 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page-item-view-edit.tsx @@ -9,42 +9,51 @@ import { SidePanelContent, SidePanelContentBlock, } from 'core/components/SidePanel'; -import {connectServices} from 'core/helpers/ReactRenderAsync'; import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; import {IFormGroup} from 'superdesk-api'; import {isHttpApiError} from 'core/helpers/network'; import {gettext} from 'core/utils'; +import ng from 'core/services/ng'; import {getFormFieldsFlat} from '../generic-form/get-form-fields-flat'; import {hasValue} from '../generic-form/has-value'; -interface IProps { +interface IProps { operation: 'editing' | 'creation'; editMode: boolean; - formConfig: IFormGroup; - item: {[key: string]: any}; + hiddenFields: Array; + getFormConfig(item?: Partial): IFormGroup; + item: Partial; onEditModeChange(nextValue: boolean): void; onClose: () => void; onCancel?: () => void; onSave: (nextItem) => Promise; +} + +interface IIssues { + [field: string]: Array; +} - // connected services - modal?: any; +interface IState { + nextItem: IProps['item']; + issues: IIssues; } -interface IState { - nextItem: IProps['item']; - issues: {[field: string]: Array}; +function getInitialState(props: IProps) { + return { + nextItem: props.item, + issues: {}, + }; } -const getInitialState = (props: IProps) => ({ - nextItem: props.item, - issues: {}, -}); +export class GenericListPageItemViewEdit extends React.Component, IState> { + _mounted: boolean; + modal: any; -class GenericListPageItemViewEditComponent extends React.Component { constructor(props) { super(props); + this.modal = ng.get('modal'); + this.state = getInitialState(props); this.enableEditMode = this.enableEditMode.bind(this); @@ -53,6 +62,12 @@ class GenericListPageItemViewEditComponent extends React.Component) { + handleFieldChange(field: string, nextValue: valueof['item']>) { // using updater function to avoid race conditions this.setState((prevState) => ({ ...prevState, @@ -82,7 +97,7 @@ class GenericListPageItemViewEditComponent extends React.Component { // do nothing @@ -92,33 +107,59 @@ class GenericListPageItemViewEditComponent extends React.Component fieldConfig.required && !hasValue(fieldConfig, this.state.nextItem[fieldConfig.field]), - ); + const formConfig = this.props.getFormConfig(this.state.nextItem); + const currentFields = getFormFieldsFlat(formConfig); + const currentFieldsIds = currentFields.map(({field}) => field).concat('_id').concat(this.props.hiddenFields); - if (notFilled.length > 0) { - this.setState({ - issues: notFilled.reduce((acc, fieldConfig) => { - acc[fieldConfig.field] = [gettext('Field is required')]; + /* + Form config is dynamic and can change during editing. + For example users can select a dropdown value + which would cause more fields specific to that option to appear or others to disappear. + + There might be data in the state for fields which no longer exist in form config. + Only fields in form config at the time of saving will be sent. + */ + const nextItemCleaned: Partial = currentFieldsIds.reduce>((acc, field) => { + const value = this.state.nextItem[field]; + + if (value != null) { + acc[field] = value; + } - return acc; - }, {}), + return acc; + }, {}); + + const requiredValidationErrors = currentFields + .filter( + (fieldConfig) => + fieldConfig.required === true && hasValue(fieldConfig, nextItemCleaned[fieldConfig.field]) !== true, + ) + .reduce((acc, fieldConfig) => { + acc[fieldConfig.field] = [gettext('Field is required')]; + + return acc; + }, {}); + + if (Object.keys(requiredValidationErrors).length > 0) { + this.setState({ + issues: requiredValidationErrors, }); return; } - this.props.onSave(this.state.nextItem).then(() => { - this.setState({ - issues: {}, - }, () => { - this.props.onEditModeChange(false); - }); + this.props.onSave(nextItemCleaned).then(() => { + if (this._mounted) { + this.setState({ + issues: {}, + }, () => { + this.props.onEditModeChange(false); + }); + } }) .catch((res) => { if (isHttpApiError(res)) { - let issues = {}; + let issues: IIssues = {}; for (let fieldName in res._issues) { let issuesForField = []; @@ -204,7 +245,7 @@ class GenericListPageItemViewEditComponent extends React.Component ( - GenericListPageItemViewEditComponent, - ['modal'], -); diff --git a/scripts/core/ui/components/ListPage/generic-list-page.tsx b/scripts/core/ui/components/ListPage/generic-list-page.tsx index 06ceaed04c..de7127712b 100644 --- a/scripts/core/ui/components/ListPage/generic-list-page.tsx +++ b/scripts/core/ui/components/ListPage/generic-list-page.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react/no-multi-comp */ /* eslint-disable brace-style */ import React from 'react'; @@ -20,7 +21,6 @@ import {Button} from 'core/ui/components/Nav'; import {SortBar, ISortFields} from 'core/ui/components/SortBar'; import {connectCrudManager} from 'core/helpers/CrudManager'; import {TagLabel} from 'core/ui/components/TagLabel'; -import {connectServices} from 'core/helpers/ReactRenderAsync'; import {getFormGroupForFiltering} from 'core/ui/components/generic-form/get-form-group-for-filtering'; import {getFormFieldsRecursive, getFormFieldPreviewComponent} from 'core/ui/components/generic-form/form-field'; import {FormViewEdit} from 'core/ui/components/generic-form/from-group'; @@ -28,38 +28,72 @@ import {getInitialValues} from '../generic-form/get-initial-values'; import {generateFilterForServer} from '../generic-form/generate-filter-for-server'; import {getFormFieldsFlat} from '../generic-form/get-form-fields-flat'; import { - IBaseRestApiResponse, + IItemWithId, IPropsGenericForm, IGenericListPageComponent, ICrudManager, IFormGroup, + IBaseRestApiResponse, + ISortOption, } from 'superdesk-api'; import {gettext} from 'core/utils'; +import ng from 'core/services/ng'; +import {OnlyWithChildren} from '../only-with-children'; -interface IState> { +interface IState { previewItemId: string | null; editItemId: string | null; - newItem: {[key: string]: any} | null; + newItem: Partial | null; filtersOpen: boolean; - filterValues: Partial; + filterValues: Partial; loading: boolean; refetchDataScheduled: boolean; } -interface IPropsConnected { +export interface IPropsConnected { items?: ICrudManager; - modal: any; - notify: any; - $rootScope: any; } -export class GenericListPageComponent - extends React.Component & IPropsConnected, IState> +class DefaultItemsContainerComponent extends React.PureComponent { + render() { + return ( +
    + {this.props.children} +
    + ); + } +} + +const subNavWrapper: React.ComponentType = (props) => ( +
    +
    +
    + {props.children} +
    +
    +
    +); + +export class GenericListPageComponent + extends React.Component & IPropsConnected, IState> implements IGenericListPageComponent { searchBarRef: SearchBar | null; + modal: any; + notify: any; + $rootScope: any; - constructor(props: IPropsGenericForm & IPropsConnected) { + constructor(props: IPropsGenericForm & IPropsConnected) { super(props); // preview and edit mode can enabled at the same time, but only one pane will be displayed at once @@ -78,6 +112,7 @@ export class GenericListPageComponent }; this.openPreview = this.openPreview.bind(this); + this.startEditing = this.startEditing.bind(this); this.closePreview = this.closePreview.bind(this); this.setFiltersVisibility = this.setFiltersVisibility.bind(this); this.handleFilterFieldChange = this.handleFilterFieldChange.bind(this); @@ -86,19 +121,25 @@ export class GenericListPageComponent this.deleteItem = this.deleteItem.bind(this); this.getActiveFilters = this.getActiveFilters.bind(this); this.removeFilter = this.removeFilter.bind(this); + this.getItemsCount = this.getItemsCount.bind(this); + this.refetchDataUsingCurrentFilters = this.refetchDataUsingCurrentFilters.bind(this); this.filter = this.filter.bind(this); + + this.modal = ng.get('modal'); + this.notify = ng.get('notify'); + this.$rootScope = ng.get('$rootScope'); } openPreview(id) { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t open a preview while in edit mode', ), }); } else if (this.state.newItem != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t open a preview while in create mode', @@ -132,15 +173,20 @@ export class GenericListPageComponent this.props.items.removeFilter(fieldName); }); } + + getItemsCount() { + return this.props.items?._items?.length ?? 0; + } + deleteItem(item: T) { const deleteNow = () => this.props.items.delete(item).then(() => { - this.props.notify.success(gettext('The item has been deleted.')); + this.notify.success(gettext('The item has been deleted.')); }); - this.props.modal.confirm(gettext('Are you sure you want to delete this item?')) + this.modal.confirm(gettext('Are you sure you want to delete this item?')) .then(() => { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Edit mode must closed before you can delete an item.', @@ -157,7 +203,7 @@ export class GenericListPageComponent } startEditing(id: string) { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t edit this item, because another item is in edit mode.', @@ -222,7 +268,7 @@ export class GenericListPageComponent } filter() { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'The item in edit mode must be closed before you can filter.', @@ -269,9 +315,9 @@ export class GenericListPageComponent setFiltersVisibility(nextValue: boolean) { this.setState({filtersOpen: nextValue}); } - openNewItemForm() { + openNewItemForm(initialValues?: {[key: string]: any}) { if (this.state.editItemId != null) { - this.props.modal.alert({ + this.modal.alert({ headerText: gettext('Warning'), bodyText: gettext( 'Can\'t add a new item, because another item is in edit mode.', @@ -280,8 +326,9 @@ export class GenericListPageComponent } else { this.setState({ newItem: { - ...getInitialValues(this.props.formConfig), + ...getInitialValues(this.props.getFormConfig()), ...this.props.getNewItemTemplate == null ? {} : this.props.getNewItemTemplate(this), + ...(initialValues ?? {}), }, previewItemId: null, }); @@ -290,11 +337,11 @@ export class GenericListPageComponent componentDidMount() { const filters = this.props.defaultFilters ? this.validateFilters(this.props.defaultFilters) : {}; - this.props.items.read(1, this.props.defaultSortOption, filters); + this.props.items.read(1, this.props.items.activeSortOption, filters); if (this.props.refreshOnEvents != null) { this.props.refreshOnEvents.forEach((eventName) => { - this.props.$rootScope.$on(eventName, () => { + this.$rootScope.$on(eventName, () => { // will update the list using selected filtering / sort options this.refetchDataUsingCurrentFilters(); }); @@ -307,35 +354,45 @@ export class GenericListPageComponent } } render() { - if (this.props.items._items == null) { + const {items, additionalProps} = this.props; + + if (items._items == null) { // loading return null; } - const {activeFilters} = this.props.items; - const totalResults = this.props.items._meta.total; - const pageSize = this.props.items._meta.max_results; + const {activeFilters} = items; + const totalResults = items._meta.total; + const pageSize = items._meta.max_results; const pageCount = Math.ceil(totalResults / pageSize); - const {formConfig, renderRow} = this.props; + const {getFormConfig, ItemComponent} = this.props; + const ItemsContainerComponent = this.props.ItemsContainerComponent ?? DefaultItemsContainerComponent; - const formConfigForFilters = getFormGroupForFiltering(formConfig); - const fieldsList = getFormFieldsRecursive(formConfig.form); + const formConfigForFilters = getFormGroupForFiltering(this.props.getFormConfig()); + const fieldsList = getFormFieldsRecursive(getFormConfig().form); const sortOptions: Array = [ ...fieldsList.map(({label, field}) => ({label, field})), - { - label: gettext('Last updated'), - field: '_updated', - }, - { - label: gettext('First created'), - field: '_created', - }, + ...(this.props.additionalSortOptions ?? []), ]; + var page: IGenericListPageComponent = { + openPreview: this.openPreview, + startEditing: this.startEditing, + closePreview: this.closePreview, + setFiltersVisibility: this.setFiltersVisibility, + handleFilterFieldChange: this.handleFilterFieldChange, + openNewItemForm: this.openNewItemForm, + closeNewItemForm: this.closeNewItemForm, + deleteItem: this.deleteItem, + getActiveFilters: this.getActiveFilters, + removeFilter: this.removeFilter, + getItemsCount: this.getItemsCount, + }; + const getContents = () => { - if (this.props.items._items.length === 0) { + if (items._items.length === 0) { if (Object.keys(activeFilters).length > 0) { return ( @@ -355,91 +412,92 @@ export class GenericListPageComponent } } else { return ( -
    + { - this.props.items._items.map( - (item) => renderRow(item._id, item, this), + items._items.map( + (item, i) => ( + + ), ) } -
    + ); } }; return ( -
    -
    -
    +
    + + { + this.props.disallowFiltering ? null : ( +
    +
    + ) + } + + { + this.props.fieldForSearch == null ? null : ( +
    + { + this.searchBarRef = instance; + }} + value="" + allowCollapsed={false} + onSearch={(value) => { + this.handleFilterFieldChange( + this.props.fieldForSearch.field, + value, + this.filter, + ); + }} + /> +
    + ) + } + + { - this.props.disallowFiltering ? null : ( -
    -
    + items.activeSortOption == null ? null : ( + ) } { - this.props.fieldForSearch == null ? null : ( -
    - { - this.searchBarRef = instance; - }} - value="" - allowCollapsed={false} - onSearch={(value) => { - this.handleFilterFieldChange( - this.props.fieldForSearch.field, - value, - this.filter, - ); - }} - /> + this.props.disallowCreatingNewItem === true ? null : ( +
    +
    ) } - -
    - - - { - this.props.disallowCreatingNewItem === true ? null : ( -
    - -
    - ) - } -
    -
    -
    + + { this.state.filtersOpen ? ( @@ -466,7 +524,9 @@ export class GenericListPageComponent > ) : null } -
    +
    { - this.props.items._items.length === 0 ? null : ( + items._meta.max_results === items._meta.total || items._items.length === 0 ? null : (
    marginPagesDisplayed={2} pageRangeDisplayed={5} onPageChange={({selected}) => { - if (this.props.items._meta.page !== (selected + 1)) { - this.props.items.goToPage(selected + 1); + if (items._meta.page !== (selected + 1)) { + items.goToPage(selected + 1); } }} - initialPage={this.props.items._meta.page - 1} + initialPage={items._meta.page - 1} containerClassName={'bs-pagination'} activeClassName="active" /> @@ -516,22 +576,24 @@ export class GenericListPageComponent data-test-id="list-page--filters-active" > { - Object.keys(activeFilters).map((fieldName, i) => { + Object.keys(activeFilters).map((field_id, i) => { + const currentField = getFormFieldsFlat(formConfigForFilters).find( + ({field}) => field === field_id, + ); + const filterValuePreview = getFormFieldPreviewComponent( - this.props.items.activeFilters, - getFormFieldsFlat(formConfigForFilters).find( - ({field}) => field === fieldName, - ), + items.activeFilters, + currentField, ); return ( { - this.removeFilter(fieldName); + this.removeFilter(field_id); }} > - {fieldName}:{' '} + {currentField.label}:  {filterValuePreview} ); @@ -550,17 +612,18 @@ export class GenericListPageComponent { this.setState((prevState) => ({ ...prevState, newItem: null, })); }} - item={this.state.newItem} - onSave={(item: T) => this.props.items.create(item).then((res) => { - this.props.notify.success(gettext('The item has been created.')); + onSave={(item: T) => items.create(item).then((res) => { + this.notify.success(gettext('The item has been created.')); this.closeNewItemForm(); this.openPreview(res._id); })} @@ -572,20 +635,19 @@ export class GenericListPageComponent { this.setState((prevState) => ({ ...prevState, editItemId: null, })); }} - operation="editing" - formConfig={formConfig} - item={ - this.props.items._items.find(({_id}) => _id === this.state.editItemId) - } - onSave={(nextItem) => this.props.items.update(nextItem).then(() => { - this.props.notify.success(gettext('The item has been updated.')); + item={items._items.find(({_id}) => _id === this.state.editItemId)} + getFormConfig={getFormConfig} + onSave={(nextItem) => items.update(nextItem).then(() => { + this.notify.success(gettext('The item has been updated.')); })} onClose={this.closePreview} /> @@ -594,19 +656,18 @@ export class GenericListPageComponent { this.setState((prevState) => ({ ...prevState, editItemId: prevState.previewItemId, })); }} - operation="editing" - formConfig={formConfig} - item={ - this.props.items._items.find(({_id}) => _id === this.state.previewItemId) - } - onSave={(nextItem) => this.props.items.update(nextItem)} + item={items._items.find(({_id}) => _id === this.state.previewItemId)} + getFormConfig={getFormConfig} + onSave={(nextItem) => items.update(nextItem)} onClose={this.closePreview} /> @@ -618,29 +679,56 @@ export class GenericListPageComponent } } -export const getGenericListPageComponent = - (resource: string, formConfig: IFormGroup) => - connectServices>( - connectCrudManager, IPropsConnected, T>( - GenericListPageComponent, - 'items', - resource, - (filters: IFormGroup) => { - const formConfigForFilters = getFormGroupForFiltering(formConfig); - const fieldTypesLookup = getFormFieldsFlat(formConfigForFilters) - .reduce((accumulator, item) => ({...accumulator, ...{[item.field]: item.type}}), {}); - - let filtersFormatted = {}; - - for (let fieldName in filters) { - filtersFormatted[fieldName] = generateFilterForServer( - fieldTypesLookup[fieldName], - filters[fieldName], - ); - } +export const getGenericListPageComponent = ( + resource: string, + formConfig: IFormGroup, + defaultSortOption?: ISortOption, + additionalProps?: P, +) => { + var Component = connectCrudManager, IPropsConnected, T>( + GenericListPageComponent, + 'items', + resource, + defaultSortOption, + (filters: IFormGroup) => { + const formConfigForFilters = getFormGroupForFiltering(formConfig); + const fieldTypesLookup = getFormFieldsFlat(formConfigForFilters) + .reduce((accumulator, item) => ({...accumulator, ...{[item.field]: item.type}}), {}); + + let filtersFormatted = {}; + + for (let fieldName in filters) { + filtersFormatted[fieldName] = generateFilterForServer( + fieldTypesLookup[fieldName], + filters[fieldName], + ); + } - return filtersFormatted; - }, - ) - , ['modal', '$rootScope', 'notify'], - ); + return filtersFormatted; + }, + ); + + return class WithAdditionalSortOptions extends React.PureComponent> { + render() { + return ( + + ); + } + }; +}; diff --git a/scripts/core/ui/components/Page/index.tsx b/scripts/core/ui/components/Page/index.tsx index 4d1a2960f9..a9225b8cbc 100644 --- a/scripts/core/ui/components/Page/index.tsx +++ b/scripts/core/ui/components/Page/index.tsx @@ -10,7 +10,7 @@ export class Page extends React.PureComponent<{title: string}> {

    {title}

    -
    +
    {children}
    diff --git a/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx b/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx index 36c827a754..0dd66f438b 100644 --- a/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx +++ b/scripts/core/ui/components/generic-form/form-direction-wrapper.tsx @@ -21,7 +21,7 @@ export class FormGroupDirectionWrapper extends React.Component { ? `${currentClassname} form-group-horizontal` : 'form-group-horizontal'; - return
    ; + return
    {this.props.children}
    ; } else { assertNever(direction); } diff --git a/scripts/core/ui/components/generic-form/form-field.tsx b/scripts/core/ui/components/generic-form/form-field.tsx index d261e34a54..7262934fb0 100644 --- a/scripts/core/ui/components/generic-form/form-field.tsx +++ b/scripts/core/ui/components/generic-form/form-field.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {TextSingleLine} from './input-types/text-single-line'; +import {PlainText} from './input-types/plain-text'; import {assertNever} from 'core/helpers/typescript-helpers'; import {isIFormGroup, isIFormField, FormFieldType} from './interfaces/form'; import {VocabularySingleValue} from './input-types/vocabulary_single_value'; @@ -13,14 +13,19 @@ import {StageSingleValue} from './input-types/stage_single_value'; import {getMacroSingleValue} from './input-types/macro_single_value'; import {YesNo} from './input-types/yes-no'; import {IFormField, IFormGroup} from 'superdesk-api'; +import {SelectMultipleValues} from './input-types/select_multiple_values'; +import {SelectSingleValue} from './input-types/select_single_value_static'; +import {NumberComponent} from './input-types/number'; import {Select} from './input-types/select'; export function getFormFieldComponent(type: FormFieldType): React.ComponentType> { switch (type) { - case FormFieldType.textSingleLine: - return TextSingleLine; + case FormFieldType.plainText: + return PlainText; case FormFieldType.textEditor3: return TextEditor3; + case FormFieldType.number: + return NumberComponent; case FormFieldType.vocabularySingleValue: return VocabularySingleValue; case FormFieldType.checkbox: @@ -37,6 +42,8 @@ export function getFormFieldComponent(type: FormFieldType): React.ComponentType< return YesNo; case FormFieldType.select: return Select; + case FormFieldType.selectMultiple: + return SelectMultipleValues; default: assertNever(type); } diff --git a/scripts/core/ui/components/generic-form/from-group.tsx b/scripts/core/ui/components/generic-form/from-group.tsx index ca2dd8c7a4..46bee5a1df 100644 --- a/scripts/core/ui/components/generic-form/from-group.tsx +++ b/scripts/core/ui/components/generic-form/from-group.tsx @@ -6,16 +6,16 @@ import {assertNever} from 'core/helpers/typescript-helpers'; import {FormGroupWrapper} from './form-group-wrapper'; import {IFormGroup} from 'superdesk-api'; -interface IProps { +interface IProps { formConfig: IFormGroup; - item: {[key: string]: any}; + item: Partial; editMode: boolean; issues: {[field: string]: Array}; - handleFieldChange(field: keyof IProps['item'], nextValue: valueof): void; + handleFieldChange(field: string, nextValue: valueof['item']>): void; } // The component is recursive! -export class FormViewEdit extends React.Component { +export class FormViewEdit extends React.Component> { render() { const group: IFormGroup = this.props.formConfig; @@ -47,7 +47,7 @@ export class FormViewEdit extends React.Component { issues={this.props.issues[item.field] || []} previewOutput={false} onChange={ - (nextValue, fieldName?: string) => + (nextValue, fieldName?) => this.props.handleFieldChange( item.field != null ? item.field : fieldName, nextValue, diff --git a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx index 3d8e4192cc..88191d6939 100644 --- a/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx +++ b/scripts/core/ui/components/generic-form/generate-filter-for-server.tsx @@ -3,7 +3,7 @@ import {FormFieldType} from './interfaces/form'; export function generateFilterForServer(type: FormFieldType, value: any): any { switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: return { $regex: value, $options: 'i', @@ -16,6 +16,8 @@ export function generateFilterForServer(type: FormFieldType, value: any): any { case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: case FormFieldType.select: + case FormFieldType.selectMultiple: + case FormFieldType.number: return value; case FormFieldType.textEditor3: diff --git a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx index 7996b4f178..8d712c2b13 100644 --- a/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx +++ b/scripts/core/ui/components/generic-form/get-form-group-for-filtering.tsx @@ -5,11 +5,13 @@ import {IFormField, IFormGroup} from 'superdesk-api'; // different components must be used for filtering than for entering/updating items function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { switch (type) { - case FormFieldType.textSingleLine: - return FormFieldType.textSingleLine; + case FormFieldType.plainText: + return FormFieldType.plainText; case FormFieldType.textEditor3: // even though textEditor3 outputs HTML, plaintext has to be used for filtering - return FormFieldType.textSingleLine; + return FormFieldType.plainText; + case FormFieldType.number: + return FormFieldType.number; case FormFieldType.vocabularySingleValue: return FormFieldType.vocabularySingleValue; case FormFieldType.checkbox: @@ -26,6 +28,8 @@ function getFieldTypeForFiltering(type: FormFieldType): FormFieldType { return FormFieldType.yesNo; case FormFieldType.select: return FormFieldType.select; + case FormFieldType.selectMultiple: + return FormFieldType.selectMultiple; default: assertNever(type); } diff --git a/scripts/core/ui/components/generic-form/get-initial-values.tsx b/scripts/core/ui/components/generic-form/get-initial-values.tsx index 2667c8a6be..8d695cdaec 100644 --- a/scripts/core/ui/components/generic-form/get-initial-values.tsx +++ b/scripts/core/ui/components/generic-form/get-initial-values.tsx @@ -8,7 +8,7 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: const type: FormFieldType = fieldConfig.type; switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: case FormFieldType.textEditor3: return {[field]: ''}; case FormFieldType.vocabularySingleValue: @@ -18,6 +18,8 @@ function getInitialValueForFieldType(fieldConfig: IFormField): {readonly [field: case FormFieldType.macroSingleValue: case FormFieldType.yesNo: case FormFieldType.select: + case FormFieldType.selectMultiple: + case FormFieldType.number: return {[field]: undefined}; case FormFieldType.checkbox: return {[field]: false}; diff --git a/scripts/core/ui/components/generic-form/has-value.tsx b/scripts/core/ui/components/generic-form/has-value.tsx index 178bb89cc0..a82a72f99c 100644 --- a/scripts/core/ui/components/generic-form/has-value.tsx +++ b/scripts/core/ui/components/generic-form/has-value.tsx @@ -7,9 +7,12 @@ export function hasValue(fieldConfig: IFormField, value: any): boolean { const type: FormFieldType = fieldConfig.type; switch (type) { - case FormFieldType.textSingleLine: + case FormFieldType.plainText: return typeof value === 'string' && value.trim().length > 0; + case FormFieldType.number: + return typeof value === 'number'; + case FormFieldType.textEditor3: return typeof value === 'string' && value.trim().length > 0 && stripHtmlTags(value).trim().length > 0; @@ -18,14 +21,15 @@ export function hasValue(fieldConfig: IFormField, value: any): boolean { case FormFieldType.deskSingleValue: case FormFieldType.stageSingleValue: case FormFieldType.macroSingleValue: + case FormFieldType.select: return typeof value === 'string' && value.trim().length > 0; + case FormFieldType.selectMultiple: + return Array.isArray(value) && value.length > 0; + case FormFieldType.yesNo: return value === 'true' || value === 'false'; - case FormFieldType.select: - return value != null && value !== ''; - case FormFieldType.checkbox: return value === true || value === false; diff --git a/scripts/core/ui/components/generic-form/input-types/checkbox.tsx b/scripts/core/ui/components/generic-form/input-types/checkbox.tsx index 9a99fe680f..e1b2cb1e82 100644 --- a/scripts/core/ui/components/generic-form/input-types/checkbox.tsx +++ b/scripts/core/ui/components/generic-form/input-types/checkbox.tsx @@ -14,10 +14,10 @@ export class CheckboxInput extends React.Component> {
    0, - 'sd-line-input--required': this.props.formField.required === true, + 'form__row--invalid': this.props.issues.length > 0, + 'form__row--required': this.props.formField.required === true, }, ) } diff --git a/scripts/core/ui/components/generic-form/input-types/text-single-line.tsx b/scripts/core/ui/components/generic-form/input-types/number.tsx similarity index 71% rename from scripts/core/ui/components/generic-form/input-types/text-single-line.tsx rename to scripts/core/ui/components/generic-form/input-types/number.tsx index 4d25932062..9bc170d0f2 100644 --- a/scripts/core/ui/components/generic-form/input-types/text-single-line.tsx +++ b/scripts/core/ui/components/generic-form/input-types/number.tsx @@ -2,14 +2,15 @@ import React from 'react'; import classNames from 'classnames'; import {IInputType} from '../interfaces/input-types'; -export class TextSingleLine extends React.Component> { +export class NumberComponent extends React.Component> { render() { if (this.props.previewOutput) { return
    {this.props.value}
    ; } - // default value is required so React doesn't complain that uncontrolled component is changed to controlled. - const valueWithDefaultValue = this.props.value || ''; + // Default value is required to make it a controlled input. + // Empty string is used instead of a zero to allow for empty values. + const valueWithDefaultValue = this.props.value ?? ''; return (
    > { { 'sd-line-input--invalid': this.props.issues.length > 0, 'sd-line-input--required': this.props.formField.required === true, + 'sd-line-input--boxed': this.props.formField.component_parameters?.style?.boxed, }, ) } > this.props.onChange(event.target.value)} + onChange={(event) => this.props.onChange(parseFloat(event.target.value))} className="sd-line-input__input" data-test-id={`gform-input--${this.props.formField.field}`} /> diff --git a/scripts/core/ui/components/generic-form/input-types/plain-text.tsx b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx new file mode 100644 index 0000000000..13fb23ecf9 --- /dev/null +++ b/scripts/core/ui/components/generic-form/input-types/plain-text.tsx @@ -0,0 +1,57 @@ +import React from 'react'; +import classNames from 'classnames'; +import {IInputType} from '../interfaces/input-types'; + +export class PlainText extends React.Component> { + render() { + if (this.props.previewOutput) { + return
    {this.props.value}
    ; + } + + // default value is required so React doesn't complain that uncontrolled component is changed to controlled. + const valueWithDefaultValue = this.props.value || ''; + + const fieldElement = this.props.formField?.component_parameters?.multiline === true + ? ( + +
    Post on 'Enter'
    - +
    diff --git a/scripts/apps/authoring/views/article-edit.html b/scripts/apps/authoring/views/article-edit.html index 6386215203..9ef7c26eb1 100644 --- a/scripts/apps/authoring/views/article-edit.html +++ b/scripts/apps/authoring/views/article-edit.html @@ -138,7 +138,10 @@ order="{{editor.abstract.order}}" sd-validation-error="error.abstract" ng-attr-title="{{schema.abstract.readonly === true ? readOnlyLabel : ''}}" - data-required="schema.abstract.required"> + data-required="schema.abstract.required" + data-test-id="authoring-field" + data-test-value="abstract" + > @@ -254,6 +257,8 @@ data-required="schema.body_html.required" sd-width="{{editor.body_html.sdWidth|| 'full'}}" ng-attr-title="{{schema.body_html.readonly === true ? readOnlyLabel : ''}}" + data-test-id="authoring-field" + data-test-value="body_html" tansa-proofing="false"> diff --git a/scripts/apps/authoring/widgets/views/authoring-widgets.html b/scripts/apps/authoring/widgets/views/authoring-widgets.html index d1b5d785a7..ecc1649ed6 100644 --- a/scripts/apps/authoring/widgets/views/authoring-widgets.html +++ b/scripts/apps/authoring/widgets/views/authoring-widgets.html @@ -49,7 +49,10 @@ id="{{ :: widget._id }}" title="{{widget.label}}" sd-hotkey="{{generateHotkey($index+1)}}" - sd-hotkey-options="{global: true}"> + sd-hotkey-options="{global: true}" + data-test-id="authoring-widget" + data-test-value="{{widget.label}}" + > {{ comments.length }}
    + ng-if="active && !isWidgetLocked(active) && !active.pinned" + data-test-id="authoring-widget-panel" + data-test-value="{{active.label}}" + >
    - -
    + +
    @@ -76,7 +79,7 @@
    {{ user.username}}
    -
    This field is required.
    +
    This field is required.
    @@ -240,7 +243,7 @@

    Author info

    @@ -256,10 +259,10 @@

    @@ -268,7 +271,7 @@

    @@ -277,16 +280,16 @@

    -
    +

    - + - +

    diff --git a/scripts/core/editor3/directive.tsx b/scripts/core/editor3/directive.tsx index d1b880c5a4..20bdd8d771 100644 --- a/scripts/core/editor3/directive.tsx +++ b/scripts/core/editor3/directive.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react/no-multi-comp */ /* eslint-disable complexity */ import React from 'react'; import ReactDOM from 'react-dom'; @@ -19,13 +20,20 @@ import {changeEditorState, setReadOnly, changeLimitConfig} from './actions'; import ng from 'core/services/ng'; import {IArticle, RICH_FORMATTING_OPTION} from 'superdesk-api'; import {addInternalEventListener} from 'core/internal-events'; -import {CharacterLimitUiBehavior} from 'apps/authoring/authoring/components/CharacterCountConfigButton'; +import { + CharacterCountConfigButton, + CharacterLimitUiBehavior, +} from 'apps/authoring/authoring/components/CharacterCountConfigButton'; import {fieldsMetaKeys, FIELD_KEY_SEPARATOR, setFieldMetadata} from './helpers/fieldsMeta'; import {AUTHORING_FIELD_PREFERENCES} from 'core/constants'; import {getAutocompleteSuggestions} from 'core/helpers/editor'; -import {findParentScope} from '../utils'; +import {findParentScope, gettext} from '../utils'; import {editor3StateToHtml} from './html/to-html/editor3StateToHtml'; import {canAddArticleEmbed} from './components/article-embed/can-add-article-embed'; +import {TextStatisticsConnected} from 'apps/authoring/authoring/components/text-statistics-connected'; +import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId'; +import {ValidateCharactersConnected} from 'apps/authoring/authoring/ValidateCharactersConnected'; +import {Spacer} from 'core/ui/components/Spacer'; /** * @ngdoc directive @@ -125,6 +133,15 @@ class Editor3Directive { editorFormat?: Array; cleanPastedHtml?: boolean; removeEventListeners?: Array<() => void>; + fieldId?: string; + + // In most cases a function is called to get the label by ID. This is only required for custom fields. + fieldLabel?: string; + required?: boolean; + validationError?: string; + validateCharacters?: boolean; + headerStyles?: boolean; + helperText: string; constructor() { this.scope = {}; @@ -254,6 +271,20 @@ class Editor3Directive { * @description Force the output to be plain text and not contain any html. */ plainText: '=?', + + fieldId: '=', + + fieldLabel: '=', + + required: '=', + + validationError: '=', + + validateCharacters: '=', + + headerStyles: '=', + + helperText: '=', }; } @@ -269,9 +300,10 @@ class Editor3Directive { Promise.all([ ng.get('preferencesService').get(), getAutocompleteSuggestions(this.pathToValue, this.language), + getLabelNameResolver(), ]) .then((res) => { - const [userPreferences, autocompleteSuggestions] = res; + const [userPreferences, autocompleteSuggestions, getLabel] = res; // defaults this.language = this.language || 'en'; @@ -296,22 +328,148 @@ class Editor3Directive { let store = createEditorStore(this, ng.get('spellcheck')); + const fieldName: string | null = (() => { + if (this.fieldLabel != null) { + return this.fieldLabel; + } else if (this.fieldId == null) { + return null; + } else { + return getLabel(this.fieldId); + } + })(); + const renderEditor3 = () => { const element = $element.get(0); ReactDOM.unmountComponentAtNode(element); + const textStatistics = ( + + + + { + this.limit != null && ( + + ) + } + + ); + + const validationErrors = (() => { + if (this.validationError != null) { + return ( +
    + {this.validationError} +
    + ); + } else if (this.validateCharacters != null) { + return ( +
    + +
    + ); + } + })(); + + const editor3 = ( + canAddArticleEmbed(srcId, this.item._id)} + /> + ); + + const getTemplateForBody = () => { + const labelStyle: React.CSSProperties = { + marginBlockEnd: 0, + }; + + if (this.validationError != null) { + labelStyle.backgroundColor = 'red'; + } + + return ( +
    +
    + + +
    {fieldName}
    + + {this.required && ( + {gettext('Required')} + )} +     + + {textStatistics} +     + + {validationErrors} +
    + {editor3} + +
    {this.helperText}
    +
    + ); + }; + + const getTemplateForHeader = () => { + return ( +
    +
    + {fieldName} + {this.required && ( + +   + + * + + + )} +
    + +
    +
    + {editor3} +
    + + + { + validationErrors ?? ( + + {this.helperText} + + )} + {textStatistics} + +
    +
    + ); + }; + ReactDOM.render( - canAddArticleEmbed(srcId, this.item._id)} - /> + {(() => { + if (fieldName != null && this.headerStyles === true) { + return getTemplateForHeader(); + } else if (fieldName != null && this.headerStyles !== true) { + return getTemplateForBody(); + } else { + return editor3; + } + })()} , element, @@ -393,6 +551,13 @@ class Editor3Directive { } }); + // when validation status changes, increment `refreshTrigger` which will cause editor3 to re-render + $scope.$watch('vm.validationError', (val, old) => { + if (val !== old) { + this.refreshTrigger++; + } + }); + // bind the directive limit attribute bi-directionally between Angular and Redux. $scope.$watch('vm.limit', (val, old) => { // tslint:disable-next-line:triple-equals diff --git a/styles/sass/forms.scss b/styles/sass/forms.scss index cbb753d7a0..8901de4c6b 100644 --- a/styles/sass/forms.scss +++ b/styles/sass/forms.scss @@ -204,7 +204,7 @@ input[type="hidden"] { display: none; } -// legend +// legend .legend { padding: 0; color: $grayLight; @@ -371,6 +371,13 @@ textarea[readonly] { // } // } +.sd-required { + font-size: 11px; + font-style: italic; + color: $grayDark; +} + + .sd-validate { &:not(.field) label:after { color: #E51C23 ; From 83a3cfa390de707ce2ffe66bf44026893c87dd8c Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 8 Mar 2024 13:00:14 +0100 Subject: [PATCH 0985/1070] fix build --- .../@types+draft-js++immutable+3.7.6.patch | 49 ------------------- tasks/verify-client-api-changes.js | 2 +- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 patches/@types+draft-js++immutable+3.7.6.patch diff --git a/patches/@types+draft-js++immutable+3.7.6.patch b/patches/@types+draft-js++immutable+3.7.6.patch deleted file mode 100644 index 23a9749838..0000000000 --- a/patches/@types+draft-js++immutable+3.7.6.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/node_modules/@types/draft-js/node_modules/immutable/dist/immutable.d.ts b/node_modules/@types/draft-js/node_modules/immutable/dist/immutable.d.ts -index f8eb1c6..87fe41e 100644 ---- a/node_modules/@types/draft-js/node_modules/immutable/dist/immutable.d.ts -+++ b/node_modules/@types/draft-js/node_modules/immutable/dist/immutable.d.ts -@@ -1982,7 +1982,7 @@ declare module Immutable { - * - */ - map( -- mapper: (value?: V, key?: K, iter?: /*this*/Iterable) => M, -+ mapper: (value: V, key: K, iter: /*this*/Iterable) => M, - context?: any - ): /*this*/Iterable; - -@@ -1995,7 +1995,7 @@ declare module Immutable { - * - */ - filter( -- predicate: (value?: V, key?: K, iter?: /*this*/Iterable) => boolean, -+ predicate: (value: V, key: K, iter: /*this*/Iterable) => boolean, - context?: any - ): /*this*/Iterable; - -@@ -2008,7 +2008,7 @@ declare module Immutable { - * - */ - filterNot( -- predicate: (value?: V, key?: K, iter?: /*this*/Iterable) => boolean, -+ predicate: (value: V, key: K, iter: /*this*/Iterable) => boolean, - context?: any - ): /*this*/Iterable; - -@@ -2044,7 +2044,7 @@ declare module Immutable { - * - */ - sortBy( -- comparatorValueMapper: (value?: V, key?: K, iter?: /*this*/Iterable) => C, -+ comparatorValueMapper: (value: V, key: K, iter: /*this*/Iterable) => C, - comparator?: (valueA: C, valueB: C) => number - ): /*this*/Iterable; - -@@ -2055,7 +2055,7 @@ declare module Immutable { - * Note: This is always an eager operation. - */ - groupBy( -- grouper: (value?: V, key?: K, iter?: /*this*/Iterable) => G, -+ grouper: (value: V, key: K, iter: /*this*/Iterable) => G, - context?: any - ): /*Map*/Seq.Keyed>; - diff --git a/tasks/verify-client-api-changes.js b/tasks/verify-client-api-changes.js index 06519a963f..5895c8aebd 100644 --- a/tasks/verify-client-api-changes.js +++ b/tasks/verify-client-api-changes.js @@ -16,7 +16,7 @@ const allExtensions = 'scripts/extensions'; getDirectories(allExtensions).forEach((extensionDir) => { execSync( - `cd ${allExtensions}/${extensionDir} && npm install && npm run compile`, + `cd ${allExtensions}/${extensionDir} && npm ci && npm run compile`, {stdio: 'inherit'} ); }); \ No newline at end of file From 01ecc807733940d35b12fae2119f024dcfa5a3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Wed, 13 Mar 2024 12:50:58 +0100 Subject: [PATCH 0986/1070] update e2e server requirements (#4451) --- e2e/server/requirements.in | 2 +- e2e/server/requirements.txt | 84 +++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/e2e/server/requirements.in b/e2e/server/requirements.in index 9e53730db2..b3113615a4 100644 --- a/e2e/server/requirements.in +++ b/e2e/server/requirements.in @@ -1,3 +1,3 @@ honcho gunicorn -git+https://github.com/superdesk/superdesk-core.git@release/2.7#egg=Superdesk-Core +git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc4#egg=Superdesk-Core diff --git a/e2e/server/requirements.txt b/e2e/server/requirements.txt index 51ef14bdbe..2ecb6c9e03 100644 --- a/e2e/server/requirements.txt +++ b/e2e/server/requirements.txt @@ -14,35 +14,33 @@ async-timeout==4.0.3 # via redis authlib==0.14.3 # via superdesk-core -babel==2.13.1 +babel==2.14.0 # via flask-babel bcrypt==3.1.7 # via superdesk-core billiard==3.6.4.0 # via celery -blinker==1.4 +blinker==1.7.0 # via # elastic-apm # flask-mail # raven # superdesk-core -boto3==1.28.80 +boto3==1.34.61 # via superdesk-core -botocore==1.31.80 +botocore==1.34.61 # via # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via flask-oidc-ex celery[redis]==5.2.7 - # via - # celery - # superdesk-core + # via superdesk-core cerberus==1.3.5 # via # eve # superdesk-core -certifi==2023.7.22 +certifi==2024.2.2 # via # elastic-apm # elasticsearch @@ -51,11 +49,11 @@ cffi==1.16.0 # via # bcrypt # cryptography -chardet==3.0.4 +chardet==5.2.0 # via superdesk-core charset-normalizer==3.3.2 # via requests -ciso8601==1.0.8 +ciso8601==2.3.1 # via eve-elastic click==8.1.7 # via @@ -73,31 +71,27 @@ click-repl==0.3.0 # via celery croniter==0.3.37 # via superdesk-core -cryptography==41.0.5 +cryptography==42.0.5 # via # authlib # jwcrypto -deprecated==1.2.14 - # via jwcrypto draftjs-exporter[lxml]==2.1.7 - # via - # draftjs-exporter - # superdesk-core + # via superdesk-core ecs-logging==2.1.0 # via elastic-apm -elastic-apm[flask]==6.19.0 +elastic-apm[flask]==6.21.3 + # via superdesk-core +elasticsearch==7.13.4 # via - # elastic-apm + # eve-elastic # superdesk-core -elasticsearch==7.13.4 - # via eve-elastic eve==1.1.2 # via superdesk-core -eve-elastic==7.3.2 +eve-elastic==7.4.0 # via superdesk-core events==0.3 # via eve -feedparser==6.0.10 +feedparser==6.0.11 # via superdesk-core flask==1.1.2 # via @@ -116,7 +110,7 @@ flask-oidc-ex==0.5.5 # via superdesk-core flask-script==2.0.6 # via superdesk-core -future==0.18.3 +future==1.0.0 # via python-twitter gunicorn==21.2.0 # via -r requirements.in @@ -128,7 +122,7 @@ honcho==1.1.0 # via -r requirements.in httplib2==0.22.0 # via oauth2client -idna==3.4 +idna==3.6 # via requests itsdangerous==1.1.0 # via @@ -144,7 +138,7 @@ jmespath==1.0.1 # via # boto3 # botocore -jwcrypto==1.5.0 +jwcrypto==1.5.6 # via # flask-oidc-ex # python-jwt @@ -170,15 +164,15 @@ oauth2client==4.1.3 # via flask-oidc-ex oauthlib==3.2.2 # via requests-oauthlib -packaging==23.2 +packaging==24.0 # via gunicorn pillow==9.2.0 # via # reportlab # superdesk-core -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.43 # via click-repl -pyasn1==0.5.0 +pyasn1==0.5.1 # via # ldap3 # oauth2client @@ -188,6 +182,8 @@ pyasn1-modules==0.3.0 # via oauth2client pycparser==2.21 # via cffi +pyjwt==2.4.0 + # via superdesk-core pymemcache==4.0.0 # via superdesk-core pymongo==3.11.4 @@ -195,21 +191,21 @@ pymongo==3.11.4 # eve # mongolock # superdesk-core -pyparsing==3.1.1 +pyparsing==3.1.2 # via httplib2 -python-dateutil==2.7.5 +python-dateutil==2.8.2 # via # arrow # botocore # croniter # superdesk-core -python-jwt==4.0.0 +python-jwt==4.1.0 # via flask-oidc-ex python-magic==0.4.27 # via superdesk-core python-twitter==3.5 # via superdesk-core -pytz==2023.3.post1 +pytz==2024.1 # via # celery # eve-elastic @@ -219,9 +215,7 @@ pytz==2023.3.post1 pyyaml==6.0.1 # via superdesk-core raven[flask]==6.10.0 - # via - # raven - # superdesk-core + # via superdesk-core redis==4.5.5 # via # celery @@ -235,11 +229,11 @@ requests==2.31.0 # python-twitter # requests-oauthlib # superdesk-core -requests-oauthlib==1.3.1 +requests-oauthlib==1.4.0 # via python-twitter rsa==4.9 # via oauth2client -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 sgmllib3k==1.0.0 # via feedparser @@ -251,10 +245,12 @@ six==1.16.0 # flask-oidc-ex # oauth2client # python-dateutil -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@release/2.7 +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc4 # via -r requirements.in -typing-extensions==4.8.0 - # via superdesk-core +typing-extensions==4.10.0 + # via + # jwcrypto + # superdesk-core tzlocal==2.1 # via superdesk-core unidecode==0.4.21 @@ -271,7 +267,7 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.9 +wcwidth==0.2.13 # via prompt-toolkit websockets==10.3 # via superdesk-core @@ -280,6 +276,4 @@ werkzeug==1.0.1 # flask # superdesk-core wrapt==1.14.1 - # via - # deprecated - # elastic-apm + # via elastic-apm From 556316f956b099f88cebced4903df235f166fd83 Mon Sep 17 00:00:00 2001 From: Nikola Stojanovic <68916411+dzonidoo@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:33:51 +0100 Subject: [PATCH 0987/1070] fix label aligment (#4452) --- .../authoring-react/authoring-section/get-field-container.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/apps/authoring-react/authoring-section/get-field-container.tsx b/scripts/apps/authoring-react/authoring-section/get-field-container.tsx index 637a0659c1..f5d7033885 100644 --- a/scripts/apps/authoring-react/authoring-section/get-field-container.tsx +++ b/scripts/apps/authoring-react/authoring-section/get-field-container.tsx @@ -47,8 +47,8 @@ export function getFieldContainer( justifyContent: 'end', }} > - - + + {field.fieldConfig.required && ( Date: Wed, 13 Mar 2024 16:34:01 +0100 Subject: [PATCH 0988/1070] revert argument in onChangeValue function (#4450) --- scripts/core/editor3/reducers/editor3.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/core/editor3/reducers/editor3.tsx b/scripts/core/editor3/reducers/editor3.tsx index 425c81eeae..994357c8af 100644 --- a/scripts/core/editor3/reducers/editor3.tsx +++ b/scripts/core/editor3/reducers/editor3.tsx @@ -177,7 +177,7 @@ export const onChange = ( const contentChanged = state.editorState.getCurrentContent() !== editorStateNext.getCurrentContent(); if (!skipOnChange && (contentChanged || force)) { - state.onChangeValue(); + state.onChangeValue(editorStateNext.getCurrentContent()); } const newState = editorStateChangeMiddlewares(state, editorStateNext, contentChanged || force); From 91ebc15ed32abfed8be00b18a6929342c08e1820 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Mar 2024 12:42:46 +0100 Subject: [PATCH 0989/1070] remove startApp fallback (#4423) --- e2e/client/superdesk.config.js | 3 +++ scripts/index.ts | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/e2e/client/superdesk.config.js b/e2e/client/superdesk.config.js index e9d366e7d1..9f5291918f 100644 --- a/e2e/client/superdesk.config.js +++ b/e2e/client/superdesk.config.js @@ -1,5 +1,8 @@ module.exports = function(grunt) { return { + importApps: [ + '../index', + ], defaultRoute: '/workspace', features: { swimlane: {defaultNumberOfColumns: 4}, diff --git a/scripts/index.ts b/scripts/index.ts index f5124062ad..678046a92d 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -69,6 +69,7 @@ function isDateFormatValid() { return true; } +// the application should be started by importing and calling `startApp` from a customer repository export function startApp( extensions: Array, customUiComponents: IConfigurableUiComponents, @@ -207,11 +208,3 @@ export function startApp( } }); } - -// the application should be started by importing and calling `startApp` from a customer repository -// this is a fallback for e2e tests. -setTimeout(() => { - if (started !== true) { - startApp([], {}); - } -}, 500); From d763ac783e5d25c96c145fb8bc8999f8ff2117fc Mon Sep 17 00:00:00 2001 From: Mark Pittaway Date: Fri, 15 Mar 2024 15:36:24 +1100 Subject: [PATCH 0990/1070] fix(install): Remove angular-history from packages This library could not be found on github nor npmjs --- package-lock.json | 4 ---- package.json | 1 - scripts/apps/authoring/authoring/index.ts | 3 --- 3 files changed, 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a3c5927296..e2660435d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1605,10 +1605,6 @@ "pofile": "~1.0.0" } }, - "angular-history": { - "version": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", - "from": "github:decipherinc/angular-history#v0.8.0" - }, "angular-i18n": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.6.9.tgz", diff --git a/package.json b/package.json index ed09183df2..d8095d3119 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", - "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", "angular-mocks": "1.6.9", "angular-moment": "1.2.0", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 2af5600dde..45924ada13 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -1,5 +1,3 @@ -import 'angular-history/history'; - import * as svc from './services'; import * as directive from './directives'; import * as ctrl from './controllers'; @@ -85,7 +83,6 @@ angular.module('superdesk.apps.authoring', [ 'superdesk.apps.vocabularies', 'superdesk.apps.relations', 'contenteditable', - 'decipher.history', 'superdesk.config', 'angular-embed', mediaModule.name, From bc53ffd6a804478ddd147daeebd8d92fc61c29a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 15 Mar 2024 11:26:12 +0100 Subject: [PATCH 0991/1070] add angular-history library (#4454) * add angular-history library it's gone from github * fix import --- .eslintignore | 3 +- package-lock.json | 12 +- package.json | 1 - scripts/apps/authoring/authoring/index.ts | 2 +- scripts/libs/angular-history/LICENSE | 20 + scripts/libs/angular-history/README.md | 463 +++++++ scripts/libs/angular-history/history.js | 1525 +++++++++++++++++++++ scripts/libs/angular-history/package.json | 51 + 8 files changed, 2066 insertions(+), 11 deletions(-) create mode 100644 scripts/libs/angular-history/LICENSE create mode 100644 scripts/libs/angular-history/README.md create mode 100644 scripts/libs/angular-history/history.js create mode 100644 scripts/libs/angular-history/package.json diff --git a/.eslintignore b/.eslintignore index c16c049c43..5754cdf197 100644 --- a/.eslintignore +++ b/.eslintignore @@ -10,4 +10,5 @@ superdesk-common/dist e2e/client/node_modules e2e/client/dist e2e/client/**/*.js -build-tools/** \ No newline at end of file +build-tools/** +scripts/libs/* \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e8730ac66e..bc9d6fb549 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1605,10 +1605,6 @@ "pofile": "~1.0.0" } }, - "angular-history": { - "version": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", - "from": "github:decipherinc/angular-history#v0.8.0" - }, "angular-i18n": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.6.9.tgz", @@ -3021,7 +3017,7 @@ "strip-ansi": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==", "requires": { "ansi-regex": "^0.2.1" } @@ -3029,7 +3025,7 @@ "supports-color": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + "integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA==" } } }, @@ -16696,7 +16692,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -17429,7 +17425,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" }, "svgo": { "version": "0.7.2", diff --git a/package.json b/package.json index a731c730ff..783ddc840d 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", - "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", "angular-mocks": "1.6.9", "angular-moment": "1.2.0", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 2af5600dde..ee2ab90070 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -1,4 +1,4 @@ -import 'angular-history/history'; +import 'libs/angular-history/history'; import * as svc from './services'; import * as directive from './directives'; diff --git a/scripts/libs/angular-history/LICENSE b/scripts/libs/angular-history/LICENSE new file mode 100644 index 0000000000..cdc07da2cb --- /dev/null +++ b/scripts/libs/angular-history/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Decipher Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/scripts/libs/angular-history/README.md b/scripts/libs/angular-history/README.md new file mode 100644 index 0000000000..9de45346a3 --- /dev/null +++ b/scripts/libs/angular-history/README.md @@ -0,0 +1,463 @@ +angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) +=============== + +A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to +do with the "back" button, unless you want it to. + +Current Version +=============== +``` +0.7.5 +``` + +*Fair warning:* Until this project is at `1.0.0` the API is subject to change +and will likely break. + +Installation +============ + +``` +bower install angular-history +``` + +Requirements +============ + +- AngularJS 1.1.x+ +- [ngLazyBind](https://github.com/Ticore/ngLazyBind) (optional) + +Running Tests +------------- + +Clone this repo and execute: + +``` +npm install +``` + +to grab the dependencies. Then execute: + +``` +grunt test +``` + +to run the tests. This will grab the test deps from [bower](http://bower.io), +and run them against [QUnit](http://qunitjs.com) in a local server on port 8000. + +API Documentation +================= + +[API Documentation](http://decipherinc.github.io/angular-history/docs) + +Demo +==== + +For now, some in the [API documentation](http://decipherinc.github.io/angular-history/docs). + +Usage +===== + +First, include the `decipher.history` module in your application: + +```javascript +angular.module('myApp', ['decipher.history']); +``` + +Next, you will want to inject the `History` service into your component: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + // ... +}); +``` + +Optionally, you can grab the [ngLazyBind](https://github.com/Ticore/ngLazyBind) +module if you want to support lazy binding. This becomes useful if you have +say, an `` field, and you don't want every keystroke recorded +in the history. If this module is present, the `History` service will provide +extra options. + +Watching an Expression +---------------------- + +You will want to give the `History` service an expression to watch: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + $scope.foo = 'bar'; + History.watch('foo', $scope); +}); +``` + +An optional third parameter is the `description`, which will be emitted when an +item is archived, undone, redone, or reverted, via a `$broadcast()`. This +allows you to attach to the event and do something with the info, such as pop up + an alert with an "undo" button in it. This value is interpolated against the + passed `$scope` object. + +If you have the `ngLazyBind` module, you may provide a fourth parameter to +`History.watch()`: + +```javascript +History.watch('foo', $scope, 'Foo changed to {{foo}}', {timeout: 500}); +``` + +This tells the history stack to update no more often than every 500ms. This +value defaults to 1s. If you wish to use lazy binding with the default, then +simply pass an empty object `{}` as the fourth parameter. If you do not have +the `ngLazyBind` module installed, this object will simply be ignored. + +The `Watch` Object +------------------ + +Whenever you issue one of the following commands, you will receive a `Watch` +object: + +- `History.watch()` +- `History.deepWatch()` +- `History.batch()` + +This provides another layer of functionality on top of the events that the +`History` service will broadcast. You can use these *chainable* objects to run +callbacks depending on the type of action that was taken: + +```javascript +var w = History.watch('foo') + .addChangeHandler('myChangeHandler', function() { + console.log('foo got changed'); + }) + .addUndoHandler('myUndoHandler', function() { + console.log('undid foo. this message will self-destruct'); + w.removeUndoHandler('myUndoHandler'); + }); +``` + +The general recommendation is to listen for the global events if you want +general functionality, and to use these `Watch` object callbacks for specific +functionality. + +Undoing/Redoing +--------------- + +Once something is `watch()`ed, you can undo or redo changes to it, *if that +expression is assignable*. If you pass a function as the expression, you may +*not* undo/redo, but you will still have access to the history stack. + +Anyway, to undo, execute: + +```javascript +History.undo('foo', $scope); +``` + +The `$scope` will be updated with the most recent version of the object. You +can `undo()` as many times as there are changes in the expression's value since +you `watch()`ed it--this is an entire history stack. + +Furthermore, an event will be emitted. The `$rootScope` will `$broadcast()` a +`History.undone` event with the following information: + +- `expression`: The expression that was undone +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to +- `description`: The optional `description` you may have passed +- `scope`: The scope passed to `undo()` + +Redoing is pretty much as you would expect: + +```javascript +History.redo('foo', $scope); +``` + +This only works if you have previously undone something, of course. You can +undo multiple times, then redo multiple times. The event emitted after redo is +`History.redone` and the information is the same. + +Use `History.canUndo(exp, scope)` and `History.canRedo(exp, scope)` if you need +to know those things. + +Revert +------ + +You can revert to the original value at the time of the `watch()` instruction by +issuing: + +```javascript +History.revert('foo', $scope); +``` + +If you are looking at `History.history` and know where in the stack you want to +go, pass a third parameter and you will revert to a specific revision in the +stack: + +```javascript +History.revert('foo', $scope, 23); +``` + +...which will revert directly to the 23rd revision, no questions asked. + +In addition, the `History.reverted` event will return to you the `pointer` that +you passed it (which is `0` by default). + +Forgetting +---------- + +If you want to stop watching an expression for changes, issue: + +```javascript +History.forget($scope, 'foo'); +``` + +The history will be purged and the watch will be removed. Note that the `$scope` parameter comes first. If you omit the second parameter, all of the history data and watches for the scope will be destroyed. If you omit the first parameter, this will wipe the entire History service. + +Fanciness: Deep Watching +------------------------ + +Maybe it could use a different name, but often situations arise where you want +to watch an entire array of objects for a change in any of those objects' +properties. It would be incredibly inefficient to watch the entire array/object +for changes, and you wouldn't necessarily know what property got updated. + +"Deep watch" like so: + +```javascript +$scope.foos = [ + {id: 1, name: 'winken'}, + {id: 2, name: 'blinken'}, + {id: 3, name: 'nod'} +]; +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); +``` + +This works for objects as well: + +```javascript +$scope.foos = { + '1': {name: 'fe'}, + '2': {name: 'fi'}, + '3': {name: 'fo'}, + '4': {name: 'fum'} +}; +History.deepWatch('value.name for (key, value) in foos', $scope, + 'Foo with ID {{key}} changed its name to {{value.name}}'); +``` + +Now, whenever a name of any one of those things changes, history will be put on +the stack. + +There are two ways to handle this. + +### Listen for an event + +The first is to listen for the `History.archived` event: + +```javascript +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +$scope.$on('History.archived', function(evt, data) { + $scope.undo = function() { + History.undo(data.expression, data.locals); + }; +}); + +$scope.foos[0].name = 'fuh'; + +``` + +So you can bind to `undo()` in your view, and it will undo the change to +`foos[0].name`. + +`data`, as passed to the event handler, will look similar to the +`History.undone` event as mentioned above: + +- `expression`: The expression that got archived, local to `locals` +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to. +- `description`: The optional `description` you may have passed +- `locals`: A scope containing your expression's value. For example, above we +will have the object `f` available in `locals`, with a `name` property. + +### Use a handler + +The second way is to use a handler built into a `Watch` object: + +```javascript +var w = History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +w.addChangeHandler('myChangeHandler', function($expression, $locals, foo) { + $scope.undo = function() { + console.log('undoing foo with name "' + foo.name + '"'); + History.undo($expression, $locals); + }); +}, {foo: 'f'}); + +$scope.foos[0].name = 'fuh'; + +``` + +There are two special injections into your change/undo/redo/etc. handlers: + +- `$expression` The expression that changed. This may be simple, like `foo`, +or complex like `f.name` if you have used a deep watch. +- `$locals` The scope against which the change was made. If this is simple, +like in the case of a `History.watch()`, you probably don't need it. But if +you are doing a deep watch, then you will want to use this, because it does not +represent the scope you originally started with! + +`$expression` is not available in rollback handlers (discussed later). + +Otherworldly Fanciness: Batching +-------------------------------- + +You can group a bunch of changes together and undo them all at once. Note that +currently you must actually be watching the changed variables in some manner; +you must use `watch()` or `deepWatch()` first, then issue the batch. + +```javascript +// setup some data +scope.$apply('foo = [1,2,3]'); +scope.$apply('bar = "baz"'); +scope.$apply(function () { + scope.data = [ + {id: 1, name: 'foo'}, + {id: 2, name: 'bar'}, + {id: 3, name: 'baz'} + ]; + scope.otherdata = { + 1: { + name: 'foo' + }, + 2: { + name: 'bar' + }, + 3: { + name: 'baz' + } + }; +}); + +// watch some of these things through various means +History.watch('foo', scope, 'foo array changed'); +History.watch('bar', scope, 'bar string changed'); +History.deepWatch('d.name for d in data', scope, 'name in data changed'); +History.deepWatch('od.name for (key, od) in otherdata', scope, + 'name in otherdata changed'); + +// change some things outright +scope.$apply('pigs = "chickens"'); +scope.$apply('foo = [4,5,6]'); +``` + +Next we'll initiate a batch. You will receive a special new scope within your +`Watch` object that you can then pass to `History.rollback()`, which will roll +back all changes made within the batch closure. See below. + +The function you pass to `History.batch()` will accept a scope parameter, and +that is actually a child scope of the real scope. Changes are made here and +propagated to the parent's history. + +Note the second parameter, which is optional and defaults to `$rootScope`, +just like the other functions in the API. + +```javascript +var w = History.batch(function (child) { + child.$apply('foo[0] = 7'); + child.$apply('foo[1] = 8'); + child.$apply('foo[2] = 9'); // 3 changes to "foo" + child.$apply('data[0].name = "marvin"'); // one change to the "data" array + child.$apply('otherdata[1].name = "pookie"'); // one change to the "otherdata" array + child.$apply('bar = "spam"'); // change to a string + child.$apply('pigs = "cows"'); // change to something *not* watched +}, scope); +``` + +*You do not have to use the `child` variable unless you want to*. It's +perfectly legit, if you are in a digest loop already, to just make assignments. +The following is equivalent, again, if you are already in a digest (if you are +using this code in a controller, you are likely in a digest; if you're using +it in a directive, you may or may not be depending on what you're up to): + +```javascript +var w = History.batch(function (child) { + scope.foo[0] = 7; + scope.foo[1] = 8; + scope.foo[2] = 9; + scope.data[0].name = "marvin"; + scope.otherdata[1].name = "pookie"; + scope.bar = "spam"; + scope.pigs = "cows"; +}, scope); +``` + +Let's make sure to notify our lovely `console` that a rollback happened: + +```javascript +w.addRollbackHandler('myRollbackHandler', function($locals) { + // $locals is the same as the "transaction" property of the watch object "w" + console.log('a rollback happened against scope ' + $locals.$id); +}); +``` + +Now let's issue a rollback. Note that you can also listen for the +`History.batchBegan` and `History.batchEnded` events that are broadcast from the +`$rootScope`, if you want to implement more general functionality. + +```javascript +var transaction = w.transaction; +History.rollback(transaction); +``` + +Let's see what we ended up with by viewing some assertions: + +```javascript +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); +Q.equal(scope.bar, 'baz', 'bar is again baz'); +// no change here, because we didn't watch "pigs" +Q.equal(scope.pigs, 'cows', 'pigs is still cows (no change)'); +Q.equal(scope.data[0].name, 'foo', 'data[0].name is again "foo"'); +Q.equal(scope.otherdata[1].name, 'foo', 'otherdata[1].name is again foo'); + +// see that you can undo further in some cases +History.undo('foo', scope); +Q.deepEqual(scope.foo, [1, 2, 3], 'foo is again [1,2,3]'); + +// see you can redo again +History.redo('foo', scope); +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); + +// but also that you can't redo past the rollback. +// I suppose this could change, but it would put a lot +// of extra crap in the history. +Q.ok(!History.canRedo('foo', scope), 'assert no more history'); +``` + +This batching hasn't been tested with the "lazy" functionality mentioned earlier +(yet), but it will certainly help you support mass changes to many variables at +once, and be able to report those changes to the user. + +Internals +--------- +To debug, you can grab the stack itself by asking the service for it: + +```javascript +console.log(History.history); +``` + +Properties of the `History` service include: + +- `history` (the complete history stack for all of the scopes and expressions) +- `pointers` (which keeps a pointer to the index in the `history` we are at) +- `watches` (which are the actual `$watch` functions on the Scope objects) +- `lazyWatches` (which are the stored "lazy" watches if you are using them) +- `watchObjs` (which stores all `Watch` objects created) +- `descriptions` (which stores any `description` parameters passed to `watch()`) + +Author +====== + +[Christopher Hiller](http://boneskull.github.io) at +[Decipher, Inc.](http://decipherinc.github.io) + + diff --git a/scripts/libs/angular-history/history.js b/scripts/libs/angular-history/history.js new file mode 100644 index 0000000000..82440ca4e8 --- /dev/null +++ b/scripts/libs/angular-history/history.js @@ -0,0 +1,1525 @@ +/*global angular*/ + +/** + * @ngdoc overview + * @name decipher.history + * @description + * A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to do with the "back" button, unless you want it to. + * + */ +(function () { + 'use strict'; + + var DEEPWATCH_EXP = /^\s*(.*?)\s+for\s+(?:([\$\w][\$\w\d]*)|(?:\(\s*([\$\w][\$\w\d]*)\s*,\s*([\$\w][\$\w\d]*)\s*\)))\s+in\s+(.*?)$/, + DEFAULT_TIMEOUT = 1000, + lazyBindFound = false, + isDefined = angular.isDefined, + isUndefined = angular.isUndefined, + isFunction = angular.isFunction, + isArray = angular.isArray, + isString = angular.isString, + isObject = angular.isObject, + forEach = angular.forEach, + copy = angular.copy, + bind = angular.bind; + + /** + * Polyfill for Object.keys + * + * @see: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/keys + */ + if (!Object.keys) { + Object.keys = (function () { + var hasOwnProperty = Object.prototype.hasOwnProperty, + hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), + dontEnums = [ + 'toString', + 'toLocaleString', + 'valueOf', + 'hasOwnProperty', + 'isPrototypeOf', + 'propertyIsEnumerable', + 'constructor' + ], + dontEnumsLength = dontEnums.length; + + return function (obj) { + if (typeof obj !== 'object' && typeof obj !== 'function' || + obj === null) { + throw new TypeError('Object.keys called on non-object'); + } + + var result = []; + + for (var prop in obj) { + if (hasOwnProperty.call(obj, prop)) { + result.push(prop); + } + } + + if (hasDontEnumBug) { + for (var i = 0; i < dontEnumsLength; i++) { + if (hasOwnProperty.call(obj, + dontEnums[i])) { + result.push(dontEnums[i]); + } + } + } + return result; + }; + })(); + } + + // stub out lazyBind if we don't have it. + try { + angular.module('lazyBind'); + lazyBindFound = true; + } + catch (e) { + angular.module('lazyBind', []).factory('$lazyBind', function() {return angular.noop}); + } + + /** + * @ngdoc service + * @name decipher.history.service:History + * @description + * Provides an API for keeping a history of model values. + */ + angular.module('decipher.history', ['lazyBind']).service('History', + [ + '$parse', + '$rootScope', + '$interpolate', + '$lazyBind', + '$timeout', + '$log', + '$injector', + function ($parse, $rootScope, $interpolate, $lazyBind, $timeout, $log, + $injector) { + var service = this, + history = {}, + pointers = {}, + watches = {}, + watchObjs = {}, + lazyWatches = {}, + descriptions = {}, + // TODO: async safe? + batching = false, // whether or not we are currently in a batch + deepWatchId = 0; // incrementing ID of deep {@link decipher.history.object:Watch Watch instance}s + + /** + * @ngdoc object + * @name decipher.history.object:Watch + * @overview + * @constructor + * @description + * An object instance that provides several methods for executing handlers after + * certain changes have been made. + * + * Each function return the `Watch` instance, so you can chain the calls. + * + * See the docs for {@link decipher.history.service:History#deepWatch History.deepWatch()} for an example of using these functions. + * + * @todo ability to remove all handlers at once, or all handlers of a certain type + */ + var Watch = function Watch(exp, scope) { + this.exp = exp; + this.scope = scope || $rootScope; + + this.$handlers = { + $change : {}, + $undo : {}, + $rollback : {}, + $redo : {}, + $revert : {}, + }; + + this.$ignores = {}; + }; + + /** + * @description + * Helper method for the add*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @param {Function} fn Handler function to execute + * @param {Object} resolve Mapping of function parameters to values + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._addHandler = + function _addHandler(where, name, fn, resolve) { + if (!where || !name || !fn) { + throw new Error('invalid parameters to _addHandler()'); + } + this.$handlers[where][name] = { + fn: fn, + resolve: resolve || {} + }; + return this; + }; + + /** + * @description + * Helper method for remove*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._removeHandler = function (where, name) { + if (!name) { + throw new Error('invalid parameters to _removeHandler()'); + } + delete this.$handlers[where][name]; + return this; + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#addChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a change handler function with name `name` to be executed + * whenever a value matching this watch's expression changes (is archived). + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addChangeHandler = + function addChangeHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$change', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds an undo handler function with name `name` to be executed + * whenever a value matching this watch's expression is undone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addUndoHandler = + function addUndoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$undo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a redo handler function with name `name` to be executed + * whenever a value matching this watch's expression is redone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRedoHandler = + function addRedoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$redo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a revert handler function with name `name` to be executed + * whenever a value matching this watch's expression is reverted. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRevertHandler = + function addRevertHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$revert', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a rollback handler function with name `name` to be executed + * whenever the batch tied to this watch is rolled back. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRollbackHandler = + function addRollbackHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$rollback', name, fn, resolve); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a revert handler with name `name`. + */ + Watch.prototype.removeRevertHandler = function removeRevertHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$revert', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a change handler with name `name`. + */ + Watch.prototype.removeChangeHandler = function removeChangeHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$change', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a undo handler with name `name`. + */ + Watch.prototype.removeUndoHandler = function removeUndoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$undo', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a rollback handler with name `name`. + */ + Watch.prototype.removeRollbackHandler = + function removeRollbackHandler(name) { + return this._removeHandler('$rollback', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a redo handler with name `name`. + */ + Watch.prototype.removeRedoHandler = + function removeRedoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$redo', name); + }; + + /** + * Fires all handlers for a particular type, optionally w/ a scope. + * @param {string} where Watch type + * @param {string} exp Expression + * @param {Scope} [scope] Optional Scope + * @private + */ + Watch.prototype._fireHandlers = + function _fireHandlers(where, exp, scope) { + var hasScope = isDefined(scope), + localScope = this.scope, that = this; + forEach(this.$handlers[where], function (handler) { + var locals = { + $locals: localScope + }; + if (isDefined(scope)) { + locals.$locals = scope; + } + if (isDefined(exp)) { + locals.$expression = exp; + } + forEach(handler.resolve, function (value, key) { + if (hasScope) { + locals[key] = $parse(value)(scope); + } else { + locals[key] = value; + } + }); + $injector.invoke(handler.fn, scope || that, locals); + }); + }; + + /** + * Fires the change handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireChangeHandlers = + function _fireChangeHandlers(exp, scope) { + this._fireHandlers('$change', exp, scope); + }; + + /** + * Fires the undo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireUndoHandlers = + function _fireUndoHandlers(exp, scope) { + this._fireHandlers('$undo', exp, scope); + }; + + /** + * Fires the redo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRedoHandlers = + function _fireRedoHandlers(exp, scope) { + this._fireHandlers('$redo', exp, scope); + }; + + /** + * Fires the revert handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRevertHandlers = + function _fireRevertHandlers(exp, scope) { + this._fireHandlers('$revert', exp, scope); + }; + + /** + * Fires the rollback handlers (note lack of scope and expression) + * @private + */ + Watch.prototype._fireRollbackHandlers = + function _fireRollbackHandlers() { + this._fireHandlers('$rollback'); + }; + + /** + * Decline to broadcast an event for this Watch. + * @param {string} eventName Name of event to avoid. i.e. "History.archived" + * @param {Function=} callback Optional callback + * @param {Object=} resolve Optional mapping of parameters to invoke + * the callback with. + * @returns {Watch} this Watch object + */ + Watch.prototype.ignoreEvent = + function ignoreEvent(eventName, callback, resolve) { + // special case; we cannot ignore History.archived within a Watch obj + // created from a batch. there may be a way around this. + if (this.exp === null && eventName === 'History.archived') { + $log.warn('cannot ignore History.archived event for batch'); + return this; + } + resolve = resolve || {}; + if (isFunction(callback)) { + this.$ignores[eventName] = { + callback: callback, + resolve: resolve + }; + } else if (isDefined(callback)) { + this.$ignores[eventName] = { + callback: function cb() { + return callback; + }, + resolve: resolve + }; + } + return this; + }; + + /** + * Broadcasts an event, taking ignored events into account. + * @param {string} eventName Event to broadcast + * @param {*} data Some data to pass + * @private + */ + Watch.prototype._broadcast = function _broadcast(eventName, data) { + var ignore = this.$ignores[eventName]; + if (!ignore || + (isFunction(ignore.callback) && + !$injector.invoke(ignore.callback, this.scope, angular.extend(ignore.resolve, {$data: data})))) { + $rootScope.$broadcast(eventName, data); + } + }; + + /** + * Undoes last change against this watch object's target. + */ + Watch.prototype.undo = function undo() { + if (this.exp === null) { + $log.warn("attempt to undo a batch; use rollback() instead"); + return; + } + service.undo(this.exp, this.scope); + }; + + /** + * Redoes last undo against this watch object's target. + */ + Watch.prototype.redo = function redo() { + if (this.exp === null) { + $log.warn("attempt to redo a batch; just execute the batch callback again"); + } + service.redo(this.exp, this.scope); + }; + + /** + * Reverts this target's watch object. + * @param {number=0} pointer Pointer to revert to + */ + Watch.prototype.revert = function revert(pointer) { + if (this.exp === null) { + $log.warn("attempt to revert a batch; use rollback() instead"); + } + service.revert(this.exp, this.scope, pointer); + }; + + /** + * Whether or not you may undo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canUndo = function canUndo() { + return this.exp === null ? false : + service.canUndo(this.exp, this.scope); + }; + + /** + * Whether or not you may redo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canRedo = function canRedo() { + return this.exp === null ? false : + service.canRedo(this.exp, this.scope); + }; + + /** + * Evaluates an expression on the scope lazily. That means it will return + * a new value every DEFAULT_TIMEOUT ms at maximum, even if you change it between + * now and then. This allows us to $broadcast at an interval instead of after + * every scope change. + * @param {Object} scope AngularJS Scope + * @param {string} exp AngularJS expression to evaluate + * @param {number} [timeout=DEFAULT_TIMEOUT] How often to change the value + * @returns {Function} + */ + var lazyWatch = function lazyWatch(scope, exp, timeout) { + var bind = $lazyBind(scope); + bind.cacheTime(timeout || DEFAULT_TIMEOUT); + + /** + * This is the "expression function" we use to $watch with. You normally + * $watch a string, but you can also watch a function, and this is one of + * those functions. This is where the actual lazy evaluation happens. + */ + return function () { + return bind.call(scope, exp); + }; + }; + + /** + * Initializes object stores for a Scope id + * @param {string} id Sccope id + * @private + */ + this._initStores = function _initStores(id) { + if (isUndefined(watches[id])) { + watches[id] = {}; + } + if (isUndefined(lazyWatches[id])) { + lazyWatches[id] = {}; + } + if (isUndefined(descriptions[id])) { + descriptions[id] = {}; + } + if (isUndefined(history[id])) { + history[id] = {}; + } + if (isUndefined(watchObjs[id])) { + watchObjs[id] = {}; + } + if (isUndefined(pointers[id])) { + pointers[id] = {}; + } + }; + + /** + * When an expression changes, store the information about it + * and increment a pointer. + * @param {string|Function} exp Expression + * @param {string} id Scope $id + * @param {Scope} locals AngularJS scope + * @param {boolean} pass Whether or not to pass on the first call + * @param {string} description AngularJS string to interpolate + * @return {Function} Watch function + * @private + */ + this._archive = function (exp, id, locals, pass, description) { + var _initStores = this._initStores; + return function (newVal, oldVal) { + var watchObj; + _initStores(id); + if (description) { + descriptions[id][exp] = $interpolate(description)(locals); + } + if (pass) { + pass = false; + return; + } + if (isUndefined(history[id][exp])) { + history[id][exp] = []; + } + if (isUndefined(pointers[id][exp])) { + pointers[id][exp] = 0; + } + history[id][exp].splice(pointers[id][exp] + 1); + history[id][exp].push(copy(newVal)); + pointers[id][exp] = history[id][exp].length - 1; + if (pointers[id][exp] > 0 && isDefined(watchObjs[id]) && + isDefined(watchObj = watchObjs[id][exp])) { + if (!batching) { + watchObj._fireChangeHandlers(exp, locals); + } + watchObj._broadcast('History.archived', { + expression: exp, + newValue: newVal, + oldValue: oldVal, + description: descriptions[id][exp], + locals: locals + }); + } + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#watch + * @method + * @methodOf decipher.history.service:History + * @description + * Register some expression(s) for watching. + * @param {string|string[]} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @returns {Watch|Array} {@link decipher.history.object:Watch Watch instance} or array of them + * + * @example + * + + + angular.module('decipher.history') + .run(function(History, $rootScope) { + $rootScope.foo = 'foo'; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + }); + + History.watch('foo', $rootScope, 'you changed the foo'); + }); + + + {{foo}}
    + {{message}}
    +     +     + */ + this.watch = function watch(exps, scope, description, lazyOptions) { + if (isUndefined(exps)) { + throw new Error('expression required'); + } + scope = scope || $rootScope; + description = description || ''; + var i, + id = scope.$id, + exp, + objs = [], + watchObj, + model; + + if (!isArray(exps)) { + exps = [exps]; + } + + this._initStores(id); + + i = exps.length; + while (i--) { + exp = exps[i]; + + // assert we have an assignable model + model = $parse(exp); + if (isUndefined(model.assign)) { + throw 'expression "' + exp + + '" is not an assignable expression'; + } + + // blast any old watches + if (isFunction(watches[id][exp])) { + watches[id][exp](); + } + + descriptions[id][exp] = $interpolate(description)(scope); + + this._watch(exp, scope, false, lazyOptions); + watchObjs[id][exp] = watchObj = new Watch(exp, scope); + objs.push(watchObj); + } + + return objs.length > 1 ? objs : objs[0]; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#deepWatch + * @method + * @methodOf decipher.history.service:History + * @description + * Allows you to watch an entire array/object full of objects, but only watch + * a certain property of each object. + * + * @example + * + + angular.module('decipher.history') + .run(function(History, $rootScope) { + var exp, locals; + + $rootScope.foos = [ + {id: 1, name: 'herp'}, + {id: 2, name: 'derp'} + ]; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + exp = data.expression; + locals = data.locals; + }) + + History.deepWatch('foo.name for foo in foos', $rootScope, + 'Changed {{foo.id}} to name "{{foo.name}}"') + .addChangeHandler('myChangeHandler', function($expression, + $locals, foo) { + console.log(foo); + console.log("(totally hit the server and update the model)"); + $rootScope.undo = function() { + History.undo($expression, $locals); + }; + $rootScope.canUndo = function() { + return History.canUndo($expression, $locals); + }; + }, {foo: 'foo'}); + }); + + + {{foos[0].name}}
    + {{message}}
    + +     +     + * @param {(string|string[])} exp Expression or array of expressions to watch + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @return {Watch} {@link decipher.history.object:Watch Watch instance} + */ + this.deepWatch = + function deepWatch(exp, scope, description, lazyOptions) { + var match, + targetName, + valueFn, + keyName, + value, + valueName, + valuesName, + watchObj, + id = scope.$id, + _clear = bind(this, this._clear), + _initStores = this._initStores, + _archive = bind(this, this._archive), + createDeepWatch = function createDeepWatch(targetName, valueName, + keyName, watchObj) { + return function (values) { + forEach(values, function (v, k) { + + var locals = scope.$new(), + id = locals.$id; + locals.$$deepWatchId = scope.$$deepWatch[targetName]; + locals.$$deepWatchTargetName = targetName; + locals[valueName] = v; + if (keyName) { + locals[keyName] = k; + } + value = valueFn(scope, locals); + + _initStores(id); + + descriptions[id][exp] = $interpolate(description)(locals); + + if (isFunction(watches[id][targetName])) { + watches[id][targetName](); + } + + if (lazyBindFound && isObject(lazyOptions)) { + watches[id][targetName] = + locals.$watch(lazyWatch(locals, targetName, + lazyOptions.timeout || 500), + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = true; + } + else { + watches[id][targetName] = locals.$watch(targetName, + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = false; + } + + watchObjs[id][targetName] = watchObj; + + locals.$on('$destroy', function () { + _clear(scope); + }); + + }); + + }; + }; + + description = description || ''; + if (!(match = exp.match(DEEPWATCH_EXP))) { + throw 'expected expression in form of "_select_ for (_key_,)? _value_ in _collection_" but got "' + + exp + '"'; + } + targetName = match[1]; + valueName = match[4] || match[2]; + valueFn = $parse(valueName); + keyName = match[3]; + valuesName = match[5]; + + if (isUndefined(scope.$$deepWatch)) { + scope.$$deepWatch = {}; + } + + // if we already have a deepWatch on this value, we + // need to kill all the child scopes. because reasons + if (isDefined(scope.$$deepWatch[targetName])) { + _clear(scope, targetName); + } + scope.$$deepWatch[targetName] = ++deepWatchId; + + _initStores(id); + watchObjs[id][targetName] = watchObj = new Watch(targetName, scope); + + // TODO: assert this doesn't leak memory like crazy. it might if + // we remove things from the values context. + watches[id][targetName] = scope.$watchCollection(valuesName, + createDeepWatch(targetName, valueName, keyName, + watchObj)); + + return watchObj; + }; + + /** + * Clears a bunch of information for a scope and optionally an array of expressions. + * Lacking an expression, this will eliminate an entire scopesworth of data. + * It will recognize deep watches and clear them out completely. + * @param {Scope} scope Scope obj + * @param {(string|string[])} exps Expression or array of expressions + * @private + */ + this._clear = function _clear(scope, exps) { + var id = scope.$id, + i, + nextSibling, + exp, + clear = function clear(id, key) { + var zap = function zap(what) { + if (isDefined(what[id][key])) { + delete what[id][key]; + if (Object.keys(what[id]).length === 0) { + delete what[id]; + } + } + }; + + if (isDefined(watches[id]) && + isFunction(watches[id][key])) { + watches[id][key](); + } + if (isDefined(watches[id])) { + zap(watches); + } + if (isDefined(watchObjs[id])) { + zap(watchObjs); + } + if (isDefined(history[id])) { + zap(history); + } + if (isDefined(pointers[id])) { + zap(pointers); + } + if (isDefined(lazyWatches[id])) { + zap(lazyWatches); + } + }, + + clearAll = function clearAll(id) { + forEach(watches[id], function (watch) { + return isFunction(watch) && watch(); + }); + delete watches[id]; + delete history[id]; + delete pointers[id]; + delete lazyWatches[id]; + delete watchObjs[id]; + }; + + if (isString(exps)) { + exps = [exps]; + } + else if (isUndefined(exps) && isDefined(watches[id])) { + exps = Object.keys(watches[id]); + } + + if (isDefined(exps)) { + i = exps.length; + while (i--) { + exp = exps[i]; + clear(id, exp); + } + } else { + clearAll(id); + } + nextSibling = scope.$$childHead; + while (nextSibling) { + this._clear(nextSibling, exp); + nextSibling = nextSibling.$$nextSibling; + } + }; + + + /** + * @ngdoc function + * @name decipher.history.service:History#forget + * @method + * @methodOf decipher.history.service:History + * @description + * Unregister some watched expression(s). + * @param {(string|string[])} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope object; defaults to $rootScope + */ + this.forget = function forget(scope, exps) { + scope = scope || $rootScope; + if (isDefined(exps) && isString(exps)) { + exps = [exps]; + } + this._clear(scope, exps); + }; + + /** + * Internal function to change some value in the stack to another. + * Kills the watch and then calls `_watch()` to restore it. + * @param {Scope} scope Scope object + * @param {string} exp AngularJS expression + * @param {array} stack History stack; see `History.history` + * @param {number} pointer Pointer + * @returns {{oldValue: {*}, newValue: {*}}} The old value and the new value + * @private + */ + this._do = function _do(scope, exp, stack, pointer) { + var model, + oldValue, + id = scope.$id; + if (isFunction(watches[id][exp])) { + watches[id][exp](); + delete watches[id][exp]; + } + model = $parse(exp); + oldValue = model(scope); + // todo: assert there's no bug here with unassignable expressions + model.assign(scope, copy(stack[pointer])); + this._watch(exp, scope, true); + return { + oldValue: oldValue, + newValue: model(scope) + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#undo + * @method + * @methodOf decipher.history.service:History + * @description + * Undos an expression to last known value. + * @param {string} exp Expression to undo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.undo = function undo(exp, scope) { + scope = scope || $rootScope; + if (isUndefined(exp)) { + throw new Error('expression required'); + } + var id = scope.$id, + scopeHistory = history[id], + stack, + values, + pointer, + watchObj; + + if (isUndefined(scopeHistory)) { + throw 'could not find history for scope ' + id; + } + + stack = scopeHistory[exp]; + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = --pointers[id][exp]; + if (pointer < 0) { + $log.warn('attempt to undo past history'); + pointers[id][exp]++; + return; + } + values = this._do(scope, exp, stack, pointer); + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireUndoHandlers(exp, scope); + watchObj._broadcast('History.undone', { + expression: exp, + newValue: values.newValue, + oldValue: values.oldValue, + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * Actually issues the appropriate scope.$watch + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {boolean=} pass Whether or not to skip the first watch execution. Defaults to false + * @param {Object} lazyOptions Options to send the lazy module + * @private + */ + this._watch = function _watch(exp, scope, pass, lazyOptions) { + var id; + scope = scope || $rootScope; + pass = pass || false; + id = scope.$id; + + // do we have an array or object? + if (lazyBindFound && (isObject(lazyOptions) || + (lazyWatches[id] && !!lazyWatches[id][exp]))) { + watches[id][exp] = + scope.$watch(lazyWatch(scope, exp, lazyOptions.timeout), + bind(this, this._archive(exp, id, scope, pass)), true); + lazyWatches[id][exp] = true; + } + else { + watches[id][exp] = + scope.$watch(exp, bind(this, this._archive(exp, id, scope, pass)), + true); + lazyWatches[id][exp] = false; + } + + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#redo + * @method + * @methodOf decipher.history.service:History + * @description + * Redoes (?) the last undo. + * @param {string} exp Expression to redo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.redo = function redo(exp, scope) { + scope = scope || $rootScope; + var id = scope.$id, + stack = history[id][exp], + values, + pointer, + watchObj; + + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = ++pointers[id][exp]; + if (pointer === stack.length) { + $log.warn('attempt to redo past history'); + pointers[id][exp]--; + return; + } + + values = this._do(scope, exp, stack, pointer); + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRedoHandlers(exp, scope); + watchObj._broadcast('History.redone', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canUndo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we have accumulated any history for a particular expression. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {boolean} Whether or not you can issue an `undo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canUndo = History.canUndo; + }); + + + Can undo? {{canUndo('foo')}} + + + */ + this.canUndo = function canUndo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] > 0; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canRedo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we can redo an expression's value. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {Boolean} Whether or not you can issue a `redo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canRedo = History.canRedo; + $rootScope.canUndo = History.canUndo; + $rootScope.undo = History.undo; + }); + + +
    +
    + Can redo? {{canRedo('foo')}} +     +     + */ + this.canRedo = function canRedo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] < history[id][exp].length - 1; + }; + + /** + * @ngdoc function + * @method + * @methodOf decipher.history.service:History + * @name decipher.history.service:History#revert + * @description + * Reverts to earliest known value of some expression, or at a particular + * pointer if you please. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {number=} pointer Optional; defaults to 0 + */ + this.revert = function (exp, scope, pointer) { + scope = scope || $rootScope; + pointer = pointer || 0; + var id = scope.$id, + stack = history[id][exp], + values, + watchObj; + + if (isUndefined(stack)) { + $log.warn('nothing to revert'); + return; + } + values = this._do(scope, exp, stack, pointer); + + // wait; what is this? + history[id][exp].splice(); + pointers[id][exp] = pointer; + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRevertHandlers(exp, scope); + watchObj._broadcast('History.reverted', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope, + pointer: pointer + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#batch + * @method + * @methodOf decipher.history.service:History + * @description + * Executes a function within a batch context which can then be rolled back. + * @param {function} fn Function to execute + * @param {Scope=} scope Scope object; defaults to `$rootScope` + * @param {string=} description Description of this change + * @returns {Watch} {@link decipher.history.object:Watch Watch instance} + * @example + + + angular.module('decipher.history').run(function(History, $rootScope) { + var t; + + $rootScope.herp = 'derp'; + $rootScope.bar = 'baz'; + $rootScope.frick = 'frack'; + + $rootScope.$on('History.batchEnded', function(evt, data) { + t = data.transaction; + }); + + History.watch('herp'); + History.watch('bar'); + History.watch('frick'); + + $rootScope.batch = function() { + History.batch(function() { + $rootScope.herp = 'derp2'; + $rootScope.bar = 'baz2'; + $rootScope.frick = 'frack2'; + }) + .addRollbackHandler('myRollbackHandler', function() { + $rootScope.message = 'rolled a bunch of stuff back'; + }); + $rootScope.message = "batch complete"; + }; + + $rootScope.rollback = function() { + if (isDefined(t)) { + History.rollback(t); + } + }; + }); + + +
      +
    • herp: {{herp}}
      • +
    • bar: {{bar}}
      • +
    • frick: {{frick}}
      • +
    + +
    + {{message}} +     +     + */ + this.batch = function batch(fn, scope, description) { + var _clear = bind(this, this._clear), + _initStores = this._initStores, + listener, + watchObj, + child; + scope = scope || $rootScope; + if (!isFunction(fn)) { + throw new Error('transaction requires a function'); + } + + child = scope.$new(); + child.$on('$destroy', function () { + _clear(child); + }); + + listener = scope.$on('History.archived', function (evt, data) { + var deepChild, + exp = data.expression, + id; + if (data.locals.$id !== child.$id) { + deepChild = child.$new(); + deepChild.$on('$destroy', function () { + _clear(deepChild); + }); + deepChild.$$locals = data.locals; + id = deepChild.$id; + _initStores(id); + history[id][exp] = + copy(history[data.locals.$id][exp]); + pointers[id][exp] = pointers[data.locals.$id][exp] - 1; + } + }); + + watchObjs[child.$id] = watchObj = new Watch(null, child); + watchObj._broadcast('History.batchBegan', { + transaction: child, + description: description + }); + + // we need to put this into a timeout and apply manually + // since it's not clear when the watchers will get fired, + // and we must ensure that any existing watchers on the archived + // event can be skipped before the batchEnd occurs. + batching = true; + $timeout(function () { + fn(child); + scope.$apply(); + }) + .then(function () { + listener(); + batching = false; + watchObj._broadcast('History.batchEnded', { + transaction: child, + description: description + }); + }); + + + return watchObj; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#rollback + * @method + * @methodOf decipher.history.service:History + * @description + * Rolls a transaction back that was executed via {@link decipher.history.service:History#batch batch()}. + * + * For an example, see {@link decipher.history.service:History#batch batch()}. + * @param {Scope} t Scope object in which the transaction was executed. + */ + this.rollback = function rollback(t) { + + var _do = bind(this, this._do), + parent = t.$parent, + packets = {}, + nextSibling, + watchObj, + nextSiblingLocals; + if (!t || !isObject(t)) { + throw new Error('must pass a scope to rollback'); + } + + function _rollback(scope, comparisonScope) { + var id = scope.$id, + comparisonScopeId = comparisonScope.$id, + stack = history[id], + pointer, + descs, + exp, + values, + exps, + rolledback, + i; + if (stack) { + exps = Object.keys(stack); + i = exps.length; + } else { + // might not actually have history, it's ok + return; + } + while (i--) { + exp = exps[i]; + values = []; + descs = []; + pointer = pointers[comparisonScopeId][exp]; + rolledback = false; + while (pointer > pointers[id][exp]) { + pointer--; + values.push(_do(comparisonScope, + exp, history[comparisonScopeId][exp], pointer)); + pointers[comparisonScopeId][exp] = pointer; + descs.push(descriptions[comparisonScopeId][exp]); + // throw this off the history stack so + // we don't end up with it in the stack while we + // do normal undo() calls later against the same + // expression and scope + history[comparisonScopeId][exp].pop(); + rolledback = true; + } + if (rolledback) { + packets[exp] = { + values: values, + scope: scope, + comparisonScope: comparisonScope, + descriptions: descs + }; + } + } + } + + watchObj = watchObjs[t.$id]; + + if (isDefined(parent) && + isDefined(history[parent.$id])) { + _rollback(t, parent); + } + nextSibling = t.$$childHead; + while (nextSibling) { + nextSiblingLocals = nextSibling.$$locals; + if (nextSiblingLocals) { + _rollback(nextSibling, nextSiblingLocals); + } + nextSibling = nextSibling.$$nextSibling; + } + watchObj._fireRollbackHandlers(); + watchObj._broadcast('History.rolledback', packets); + + }; + + /** + * @ngdoc property + * @name decipher.history.service:History#history + * @propertyOf decipher.history.service:History + * @description + * The complete history stack, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.history = history; + + /** + * @ngdoc property + * @name decipher.history.service:History#descriptions + * @propertyOf decipher.history.service:History + * @description + * The complete map of change descriptions, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.descriptions = descriptions; + + /** + * @ngdoc property + * @name decipher.history.service:History#pointers + * @propertyOf decipher.history.service:History + * @description + * The complete pointer map, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.pointers = pointers; + + /** + * @ngdoc property + * @name decipher.history.service:History#watches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.watches = watches; + + /** + * @ngdoc property + * @name decipher.history.service:History#lazyWatches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es designated to be "lazy", keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.lazyWatches = lazyWatches; + + /** + * @ngdoc property + * @name decipher.history.service:History#watchObjs + * @propertyOf decipher.history.service:History + * @description + * The complete index of all {@link decipher.history.object:Watch Watch} objects registered, keyed by Scope `$id` and then (optionally) expression. + * @type {{}} + */ + this.watchObjs = watchObjs; + + /** + * @ngdoc property + * @name decipher.history.service:History#Watch + * @propertyOf decipher.history.service:History + * @description + * Here's the Watch prototype for you to play with. + * @type {Watch} + */ + this.Watch = Watch; + }]); +})(); diff --git a/scripts/libs/angular-history/package.json b/scripts/libs/angular-history/package.json new file mode 100644 index 0000000000..acdcc7e58d --- /dev/null +++ b/scripts/libs/angular-history/package.json @@ -0,0 +1,51 @@ +{ + "_from": "github:decipherinc/angular-history#v0.8.0", + "_id": "angular-history@0.8.0", + "_inBundle": false, + "_integrity": "", + "_location": "/angular-history", + "_phantomChildren": {}, + "_requested": { + "type": "git", + "raw": "angular-history@github:decipherinc/angular-history#v0.8.0", + "name": "angular-history", + "escapedName": "angular-history", + "rawSpec": "github:decipherinc/angular-history#v0.8.0", + "saveSpec": "github:decipherinc/angular-history#v0.8.0", + "fetchSpec": null, + "gitCommittish": "v0.8.0" + }, + "_requiredBy": [ + "/superdesk-core" + ], + "_resolved": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", + "_spec": "angular-history@github:decipherinc/angular-history#v0.8.0", + "_where": "/home/petr/dev/superdesk/client/node_modules/superdesk-core", + "bugs": { + "url": "https://github.com/decipherinc/angular-history/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) ===============", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-bower-install-simple": "^1.1.3", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-connect": "^0.10.1", + "grunt-contrib-qunit": "^0.7.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-ngdocs": "^0.2.7" + }, + "homepage": "https://github.com/decipherinc/angular-history#readme", + "license": "MIT", + "name": "angular-history", + "repository": { + "type": "git", + "url": "git://github.com/decipherinc/angular-history.git" + }, + "scripts": { + "test": "grunt test" + }, + "version": "0.8.0" +} From c32bc2d97b396cee16a33d6d0f583560e7d50e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 15 Mar 2024 11:26:12 +0100 Subject: [PATCH 0992/1070] add angular-history library (#4454) * add angular-history library it's gone from github * fix import --- .eslintignore | 3 +- package-lock.json | 8 +- package.json | 1 - scripts/apps/authoring/authoring/index.ts | 2 +- scripts/libs/angular-history/LICENSE | 20 + scripts/libs/angular-history/README.md | 463 +++++++ scripts/libs/angular-history/history.js | 1525 +++++++++++++++++++++ scripts/libs/angular-history/package.json | 51 + 8 files changed, 2064 insertions(+), 9 deletions(-) create mode 100644 scripts/libs/angular-history/LICENSE create mode 100644 scripts/libs/angular-history/README.md create mode 100644 scripts/libs/angular-history/history.js create mode 100644 scripts/libs/angular-history/package.json diff --git a/.eslintignore b/.eslintignore index 8d486aab7c..be49578701 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,4 +8,5 @@ end-to-end-testing-helpers/node_modules e2e/client/node_modules e2e/client/dist e2e/client/**/*.js -build-tools/** \ No newline at end of file +build-tools/** +scripts/libs/* \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e837e586c5..45f3446523 100644 --- a/package-lock.json +++ b/package-lock.json @@ -804,10 +804,6 @@ "pofile": "~1.0.0" } }, - "angular-history": { - "version": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", - "from": "github:decipherinc/angular-history#v0.8.0" - }, "angular-i18n": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.6.9.tgz", @@ -15623,7 +15619,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -16351,7 +16347,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" }, "svgo": { "version": "0.7.2", diff --git a/package.json b/package.json index c7cbb2264e..1d6a830456 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", - "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", "angular-mocks": "1.6.9", "angular-moment": "1.2.0", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index bc05149663..1ce81f5743 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -1,4 +1,4 @@ -import 'angular-history/history'; +import 'libs/angular-history/history'; import * as svc from './services'; import * as directive from './directives'; diff --git a/scripts/libs/angular-history/LICENSE b/scripts/libs/angular-history/LICENSE new file mode 100644 index 0000000000..cdc07da2cb --- /dev/null +++ b/scripts/libs/angular-history/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Decipher Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/scripts/libs/angular-history/README.md b/scripts/libs/angular-history/README.md new file mode 100644 index 0000000000..9de45346a3 --- /dev/null +++ b/scripts/libs/angular-history/README.md @@ -0,0 +1,463 @@ +angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) +=============== + +A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to +do with the "back" button, unless you want it to. + +Current Version +=============== +``` +0.7.5 +``` + +*Fair warning:* Until this project is at `1.0.0` the API is subject to change +and will likely break. + +Installation +============ + +``` +bower install angular-history +``` + +Requirements +============ + +- AngularJS 1.1.x+ +- [ngLazyBind](https://github.com/Ticore/ngLazyBind) (optional) + +Running Tests +------------- + +Clone this repo and execute: + +``` +npm install +``` + +to grab the dependencies. Then execute: + +``` +grunt test +``` + +to run the tests. This will grab the test deps from [bower](http://bower.io), +and run them against [QUnit](http://qunitjs.com) in a local server on port 8000. + +API Documentation +================= + +[API Documentation](http://decipherinc.github.io/angular-history/docs) + +Demo +==== + +For now, some in the [API documentation](http://decipherinc.github.io/angular-history/docs). + +Usage +===== + +First, include the `decipher.history` module in your application: + +```javascript +angular.module('myApp', ['decipher.history']); +``` + +Next, you will want to inject the `History` service into your component: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + // ... +}); +``` + +Optionally, you can grab the [ngLazyBind](https://github.com/Ticore/ngLazyBind) +module if you want to support lazy binding. This becomes useful if you have +say, an `` field, and you don't want every keystroke recorded +in the history. If this module is present, the `History` service will provide +extra options. + +Watching an Expression +---------------------- + +You will want to give the `History` service an expression to watch: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + $scope.foo = 'bar'; + History.watch('foo', $scope); +}); +``` + +An optional third parameter is the `description`, which will be emitted when an +item is archived, undone, redone, or reverted, via a `$broadcast()`. This +allows you to attach to the event and do something with the info, such as pop up + an alert with an "undo" button in it. This value is interpolated against the + passed `$scope` object. + +If you have the `ngLazyBind` module, you may provide a fourth parameter to +`History.watch()`: + +```javascript +History.watch('foo', $scope, 'Foo changed to {{foo}}', {timeout: 500}); +``` + +This tells the history stack to update no more often than every 500ms. This +value defaults to 1s. If you wish to use lazy binding with the default, then +simply pass an empty object `{}` as the fourth parameter. If you do not have +the `ngLazyBind` module installed, this object will simply be ignored. + +The `Watch` Object +------------------ + +Whenever you issue one of the following commands, you will receive a `Watch` +object: + +- `History.watch()` +- `History.deepWatch()` +- `History.batch()` + +This provides another layer of functionality on top of the events that the +`History` service will broadcast. You can use these *chainable* objects to run +callbacks depending on the type of action that was taken: + +```javascript +var w = History.watch('foo') + .addChangeHandler('myChangeHandler', function() { + console.log('foo got changed'); + }) + .addUndoHandler('myUndoHandler', function() { + console.log('undid foo. this message will self-destruct'); + w.removeUndoHandler('myUndoHandler'); + }); +``` + +The general recommendation is to listen for the global events if you want +general functionality, and to use these `Watch` object callbacks for specific +functionality. + +Undoing/Redoing +--------------- + +Once something is `watch()`ed, you can undo or redo changes to it, *if that +expression is assignable*. If you pass a function as the expression, you may +*not* undo/redo, but you will still have access to the history stack. + +Anyway, to undo, execute: + +```javascript +History.undo('foo', $scope); +``` + +The `$scope` will be updated with the most recent version of the object. You +can `undo()` as many times as there are changes in the expression's value since +you `watch()`ed it--this is an entire history stack. + +Furthermore, an event will be emitted. The `$rootScope` will `$broadcast()` a +`History.undone` event with the following information: + +- `expression`: The expression that was undone +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to +- `description`: The optional `description` you may have passed +- `scope`: The scope passed to `undo()` + +Redoing is pretty much as you would expect: + +```javascript +History.redo('foo', $scope); +``` + +This only works if you have previously undone something, of course. You can +undo multiple times, then redo multiple times. The event emitted after redo is +`History.redone` and the information is the same. + +Use `History.canUndo(exp, scope)` and `History.canRedo(exp, scope)` if you need +to know those things. + +Revert +------ + +You can revert to the original value at the time of the `watch()` instruction by +issuing: + +```javascript +History.revert('foo', $scope); +``` + +If you are looking at `History.history` and know where in the stack you want to +go, pass a third parameter and you will revert to a specific revision in the +stack: + +```javascript +History.revert('foo', $scope, 23); +``` + +...which will revert directly to the 23rd revision, no questions asked. + +In addition, the `History.reverted` event will return to you the `pointer` that +you passed it (which is `0` by default). + +Forgetting +---------- + +If you want to stop watching an expression for changes, issue: + +```javascript +History.forget($scope, 'foo'); +``` + +The history will be purged and the watch will be removed. Note that the `$scope` parameter comes first. If you omit the second parameter, all of the history data and watches for the scope will be destroyed. If you omit the first parameter, this will wipe the entire History service. + +Fanciness: Deep Watching +------------------------ + +Maybe it could use a different name, but often situations arise where you want +to watch an entire array of objects for a change in any of those objects' +properties. It would be incredibly inefficient to watch the entire array/object +for changes, and you wouldn't necessarily know what property got updated. + +"Deep watch" like so: + +```javascript +$scope.foos = [ + {id: 1, name: 'winken'}, + {id: 2, name: 'blinken'}, + {id: 3, name: 'nod'} +]; +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); +``` + +This works for objects as well: + +```javascript +$scope.foos = { + '1': {name: 'fe'}, + '2': {name: 'fi'}, + '3': {name: 'fo'}, + '4': {name: 'fum'} +}; +History.deepWatch('value.name for (key, value) in foos', $scope, + 'Foo with ID {{key}} changed its name to {{value.name}}'); +``` + +Now, whenever a name of any one of those things changes, history will be put on +the stack. + +There are two ways to handle this. + +### Listen for an event + +The first is to listen for the `History.archived` event: + +```javascript +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +$scope.$on('History.archived', function(evt, data) { + $scope.undo = function() { + History.undo(data.expression, data.locals); + }; +}); + +$scope.foos[0].name = 'fuh'; + +``` + +So you can bind to `undo()` in your view, and it will undo the change to +`foos[0].name`. + +`data`, as passed to the event handler, will look similar to the +`History.undone` event as mentioned above: + +- `expression`: The expression that got archived, local to `locals` +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to. +- `description`: The optional `description` you may have passed +- `locals`: A scope containing your expression's value. For example, above we +will have the object `f` available in `locals`, with a `name` property. + +### Use a handler + +The second way is to use a handler built into a `Watch` object: + +```javascript +var w = History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +w.addChangeHandler('myChangeHandler', function($expression, $locals, foo) { + $scope.undo = function() { + console.log('undoing foo with name "' + foo.name + '"'); + History.undo($expression, $locals); + }); +}, {foo: 'f'}); + +$scope.foos[0].name = 'fuh'; + +``` + +There are two special injections into your change/undo/redo/etc. handlers: + +- `$expression` The expression that changed. This may be simple, like `foo`, +or complex like `f.name` if you have used a deep watch. +- `$locals` The scope against which the change was made. If this is simple, +like in the case of a `History.watch()`, you probably don't need it. But if +you are doing a deep watch, then you will want to use this, because it does not +represent the scope you originally started with! + +`$expression` is not available in rollback handlers (discussed later). + +Otherworldly Fanciness: Batching +-------------------------------- + +You can group a bunch of changes together and undo them all at once. Note that +currently you must actually be watching the changed variables in some manner; +you must use `watch()` or `deepWatch()` first, then issue the batch. + +```javascript +// setup some data +scope.$apply('foo = [1,2,3]'); +scope.$apply('bar = "baz"'); +scope.$apply(function () { + scope.data = [ + {id: 1, name: 'foo'}, + {id: 2, name: 'bar'}, + {id: 3, name: 'baz'} + ]; + scope.otherdata = { + 1: { + name: 'foo' + }, + 2: { + name: 'bar' + }, + 3: { + name: 'baz' + } + }; +}); + +// watch some of these things through various means +History.watch('foo', scope, 'foo array changed'); +History.watch('bar', scope, 'bar string changed'); +History.deepWatch('d.name for d in data', scope, 'name in data changed'); +History.deepWatch('od.name for (key, od) in otherdata', scope, + 'name in otherdata changed'); + +// change some things outright +scope.$apply('pigs = "chickens"'); +scope.$apply('foo = [4,5,6]'); +``` + +Next we'll initiate a batch. You will receive a special new scope within your +`Watch` object that you can then pass to `History.rollback()`, which will roll +back all changes made within the batch closure. See below. + +The function you pass to `History.batch()` will accept a scope parameter, and +that is actually a child scope of the real scope. Changes are made here and +propagated to the parent's history. + +Note the second parameter, which is optional and defaults to `$rootScope`, +just like the other functions in the API. + +```javascript +var w = History.batch(function (child) { + child.$apply('foo[0] = 7'); + child.$apply('foo[1] = 8'); + child.$apply('foo[2] = 9'); // 3 changes to "foo" + child.$apply('data[0].name = "marvin"'); // one change to the "data" array + child.$apply('otherdata[1].name = "pookie"'); // one change to the "otherdata" array + child.$apply('bar = "spam"'); // change to a string + child.$apply('pigs = "cows"'); // change to something *not* watched +}, scope); +``` + +*You do not have to use the `child` variable unless you want to*. It's +perfectly legit, if you are in a digest loop already, to just make assignments. +The following is equivalent, again, if you are already in a digest (if you are +using this code in a controller, you are likely in a digest; if you're using +it in a directive, you may or may not be depending on what you're up to): + +```javascript +var w = History.batch(function (child) { + scope.foo[0] = 7; + scope.foo[1] = 8; + scope.foo[2] = 9; + scope.data[0].name = "marvin"; + scope.otherdata[1].name = "pookie"; + scope.bar = "spam"; + scope.pigs = "cows"; +}, scope); +``` + +Let's make sure to notify our lovely `console` that a rollback happened: + +```javascript +w.addRollbackHandler('myRollbackHandler', function($locals) { + // $locals is the same as the "transaction" property of the watch object "w" + console.log('a rollback happened against scope ' + $locals.$id); +}); +``` + +Now let's issue a rollback. Note that you can also listen for the +`History.batchBegan` and `History.batchEnded` events that are broadcast from the +`$rootScope`, if you want to implement more general functionality. + +```javascript +var transaction = w.transaction; +History.rollback(transaction); +``` + +Let's see what we ended up with by viewing some assertions: + +```javascript +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); +Q.equal(scope.bar, 'baz', 'bar is again baz'); +// no change here, because we didn't watch "pigs" +Q.equal(scope.pigs, 'cows', 'pigs is still cows (no change)'); +Q.equal(scope.data[0].name, 'foo', 'data[0].name is again "foo"'); +Q.equal(scope.otherdata[1].name, 'foo', 'otherdata[1].name is again foo'); + +// see that you can undo further in some cases +History.undo('foo', scope); +Q.deepEqual(scope.foo, [1, 2, 3], 'foo is again [1,2,3]'); + +// see you can redo again +History.redo('foo', scope); +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); + +// but also that you can't redo past the rollback. +// I suppose this could change, but it would put a lot +// of extra crap in the history. +Q.ok(!History.canRedo('foo', scope), 'assert no more history'); +``` + +This batching hasn't been tested with the "lazy" functionality mentioned earlier +(yet), but it will certainly help you support mass changes to many variables at +once, and be able to report those changes to the user. + +Internals +--------- +To debug, you can grab the stack itself by asking the service for it: + +```javascript +console.log(History.history); +``` + +Properties of the `History` service include: + +- `history` (the complete history stack for all of the scopes and expressions) +- `pointers` (which keeps a pointer to the index in the `history` we are at) +- `watches` (which are the actual `$watch` functions on the Scope objects) +- `lazyWatches` (which are the stored "lazy" watches if you are using them) +- `watchObjs` (which stores all `Watch` objects created) +- `descriptions` (which stores any `description` parameters passed to `watch()`) + +Author +====== + +[Christopher Hiller](http://boneskull.github.io) at +[Decipher, Inc.](http://decipherinc.github.io) + + diff --git a/scripts/libs/angular-history/history.js b/scripts/libs/angular-history/history.js new file mode 100644 index 0000000000..82440ca4e8 --- /dev/null +++ b/scripts/libs/angular-history/history.js @@ -0,0 +1,1525 @@ +/*global angular*/ + +/** + * @ngdoc overview + * @name decipher.history + * @description + * A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to do with the "back" button, unless you want it to. + * + */ +(function () { + 'use strict'; + + var DEEPWATCH_EXP = /^\s*(.*?)\s+for\s+(?:([\$\w][\$\w\d]*)|(?:\(\s*([\$\w][\$\w\d]*)\s*,\s*([\$\w][\$\w\d]*)\s*\)))\s+in\s+(.*?)$/, + DEFAULT_TIMEOUT = 1000, + lazyBindFound = false, + isDefined = angular.isDefined, + isUndefined = angular.isUndefined, + isFunction = angular.isFunction, + isArray = angular.isArray, + isString = angular.isString, + isObject = angular.isObject, + forEach = angular.forEach, + copy = angular.copy, + bind = angular.bind; + + /** + * Polyfill for Object.keys + * + * @see: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/keys + */ + if (!Object.keys) { + Object.keys = (function () { + var hasOwnProperty = Object.prototype.hasOwnProperty, + hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), + dontEnums = [ + 'toString', + 'toLocaleString', + 'valueOf', + 'hasOwnProperty', + 'isPrototypeOf', + 'propertyIsEnumerable', + 'constructor' + ], + dontEnumsLength = dontEnums.length; + + return function (obj) { + if (typeof obj !== 'object' && typeof obj !== 'function' || + obj === null) { + throw new TypeError('Object.keys called on non-object'); + } + + var result = []; + + for (var prop in obj) { + if (hasOwnProperty.call(obj, prop)) { + result.push(prop); + } + } + + if (hasDontEnumBug) { + for (var i = 0; i < dontEnumsLength; i++) { + if (hasOwnProperty.call(obj, + dontEnums[i])) { + result.push(dontEnums[i]); + } + } + } + return result; + }; + })(); + } + + // stub out lazyBind if we don't have it. + try { + angular.module('lazyBind'); + lazyBindFound = true; + } + catch (e) { + angular.module('lazyBind', []).factory('$lazyBind', function() {return angular.noop}); + } + + /** + * @ngdoc service + * @name decipher.history.service:History + * @description + * Provides an API for keeping a history of model values. + */ + angular.module('decipher.history', ['lazyBind']).service('History', + [ + '$parse', + '$rootScope', + '$interpolate', + '$lazyBind', + '$timeout', + '$log', + '$injector', + function ($parse, $rootScope, $interpolate, $lazyBind, $timeout, $log, + $injector) { + var service = this, + history = {}, + pointers = {}, + watches = {}, + watchObjs = {}, + lazyWatches = {}, + descriptions = {}, + // TODO: async safe? + batching = false, // whether or not we are currently in a batch + deepWatchId = 0; // incrementing ID of deep {@link decipher.history.object:Watch Watch instance}s + + /** + * @ngdoc object + * @name decipher.history.object:Watch + * @overview + * @constructor + * @description + * An object instance that provides several methods for executing handlers after + * certain changes have been made. + * + * Each function return the `Watch` instance, so you can chain the calls. + * + * See the docs for {@link decipher.history.service:History#deepWatch History.deepWatch()} for an example of using these functions. + * + * @todo ability to remove all handlers at once, or all handlers of a certain type + */ + var Watch = function Watch(exp, scope) { + this.exp = exp; + this.scope = scope || $rootScope; + + this.$handlers = { + $change : {}, + $undo : {}, + $rollback : {}, + $redo : {}, + $revert : {}, + }; + + this.$ignores = {}; + }; + + /** + * @description + * Helper method for the add*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @param {Function} fn Handler function to execute + * @param {Object} resolve Mapping of function parameters to values + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._addHandler = + function _addHandler(where, name, fn, resolve) { + if (!where || !name || !fn) { + throw new Error('invalid parameters to _addHandler()'); + } + this.$handlers[where][name] = { + fn: fn, + resolve: resolve || {} + }; + return this; + }; + + /** + * @description + * Helper method for remove*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._removeHandler = function (where, name) { + if (!name) { + throw new Error('invalid parameters to _removeHandler()'); + } + delete this.$handlers[where][name]; + return this; + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#addChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a change handler function with name `name` to be executed + * whenever a value matching this watch's expression changes (is archived). + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addChangeHandler = + function addChangeHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$change', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds an undo handler function with name `name` to be executed + * whenever a value matching this watch's expression is undone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addUndoHandler = + function addUndoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$undo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a redo handler function with name `name` to be executed + * whenever a value matching this watch's expression is redone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRedoHandler = + function addRedoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$redo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a revert handler function with name `name` to be executed + * whenever a value matching this watch's expression is reverted. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRevertHandler = + function addRevertHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$revert', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a rollback handler function with name `name` to be executed + * whenever the batch tied to this watch is rolled back. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRollbackHandler = + function addRollbackHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$rollback', name, fn, resolve); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a revert handler with name `name`. + */ + Watch.prototype.removeRevertHandler = function removeRevertHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$revert', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a change handler with name `name`. + */ + Watch.prototype.removeChangeHandler = function removeChangeHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$change', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a undo handler with name `name`. + */ + Watch.prototype.removeUndoHandler = function removeUndoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$undo', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a rollback handler with name `name`. + */ + Watch.prototype.removeRollbackHandler = + function removeRollbackHandler(name) { + return this._removeHandler('$rollback', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a redo handler with name `name`. + */ + Watch.prototype.removeRedoHandler = + function removeRedoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$redo', name); + }; + + /** + * Fires all handlers for a particular type, optionally w/ a scope. + * @param {string} where Watch type + * @param {string} exp Expression + * @param {Scope} [scope] Optional Scope + * @private + */ + Watch.prototype._fireHandlers = + function _fireHandlers(where, exp, scope) { + var hasScope = isDefined(scope), + localScope = this.scope, that = this; + forEach(this.$handlers[where], function (handler) { + var locals = { + $locals: localScope + }; + if (isDefined(scope)) { + locals.$locals = scope; + } + if (isDefined(exp)) { + locals.$expression = exp; + } + forEach(handler.resolve, function (value, key) { + if (hasScope) { + locals[key] = $parse(value)(scope); + } else { + locals[key] = value; + } + }); + $injector.invoke(handler.fn, scope || that, locals); + }); + }; + + /** + * Fires the change handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireChangeHandlers = + function _fireChangeHandlers(exp, scope) { + this._fireHandlers('$change', exp, scope); + }; + + /** + * Fires the undo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireUndoHandlers = + function _fireUndoHandlers(exp, scope) { + this._fireHandlers('$undo', exp, scope); + }; + + /** + * Fires the redo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRedoHandlers = + function _fireRedoHandlers(exp, scope) { + this._fireHandlers('$redo', exp, scope); + }; + + /** + * Fires the revert handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRevertHandlers = + function _fireRevertHandlers(exp, scope) { + this._fireHandlers('$revert', exp, scope); + }; + + /** + * Fires the rollback handlers (note lack of scope and expression) + * @private + */ + Watch.prototype._fireRollbackHandlers = + function _fireRollbackHandlers() { + this._fireHandlers('$rollback'); + }; + + /** + * Decline to broadcast an event for this Watch. + * @param {string} eventName Name of event to avoid. i.e. "History.archived" + * @param {Function=} callback Optional callback + * @param {Object=} resolve Optional mapping of parameters to invoke + * the callback with. + * @returns {Watch} this Watch object + */ + Watch.prototype.ignoreEvent = + function ignoreEvent(eventName, callback, resolve) { + // special case; we cannot ignore History.archived within a Watch obj + // created from a batch. there may be a way around this. + if (this.exp === null && eventName === 'History.archived') { + $log.warn('cannot ignore History.archived event for batch'); + return this; + } + resolve = resolve || {}; + if (isFunction(callback)) { + this.$ignores[eventName] = { + callback: callback, + resolve: resolve + }; + } else if (isDefined(callback)) { + this.$ignores[eventName] = { + callback: function cb() { + return callback; + }, + resolve: resolve + }; + } + return this; + }; + + /** + * Broadcasts an event, taking ignored events into account. + * @param {string} eventName Event to broadcast + * @param {*} data Some data to pass + * @private + */ + Watch.prototype._broadcast = function _broadcast(eventName, data) { + var ignore = this.$ignores[eventName]; + if (!ignore || + (isFunction(ignore.callback) && + !$injector.invoke(ignore.callback, this.scope, angular.extend(ignore.resolve, {$data: data})))) { + $rootScope.$broadcast(eventName, data); + } + }; + + /** + * Undoes last change against this watch object's target. + */ + Watch.prototype.undo = function undo() { + if (this.exp === null) { + $log.warn("attempt to undo a batch; use rollback() instead"); + return; + } + service.undo(this.exp, this.scope); + }; + + /** + * Redoes last undo against this watch object's target. + */ + Watch.prototype.redo = function redo() { + if (this.exp === null) { + $log.warn("attempt to redo a batch; just execute the batch callback again"); + } + service.redo(this.exp, this.scope); + }; + + /** + * Reverts this target's watch object. + * @param {number=0} pointer Pointer to revert to + */ + Watch.prototype.revert = function revert(pointer) { + if (this.exp === null) { + $log.warn("attempt to revert a batch; use rollback() instead"); + } + service.revert(this.exp, this.scope, pointer); + }; + + /** + * Whether or not you may undo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canUndo = function canUndo() { + return this.exp === null ? false : + service.canUndo(this.exp, this.scope); + }; + + /** + * Whether or not you may redo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canRedo = function canRedo() { + return this.exp === null ? false : + service.canRedo(this.exp, this.scope); + }; + + /** + * Evaluates an expression on the scope lazily. That means it will return + * a new value every DEFAULT_TIMEOUT ms at maximum, even if you change it between + * now and then. This allows us to $broadcast at an interval instead of after + * every scope change. + * @param {Object} scope AngularJS Scope + * @param {string} exp AngularJS expression to evaluate + * @param {number} [timeout=DEFAULT_TIMEOUT] How often to change the value + * @returns {Function} + */ + var lazyWatch = function lazyWatch(scope, exp, timeout) { + var bind = $lazyBind(scope); + bind.cacheTime(timeout || DEFAULT_TIMEOUT); + + /** + * This is the "expression function" we use to $watch with. You normally + * $watch a string, but you can also watch a function, and this is one of + * those functions. This is where the actual lazy evaluation happens. + */ + return function () { + return bind.call(scope, exp); + }; + }; + + /** + * Initializes object stores for a Scope id + * @param {string} id Sccope id + * @private + */ + this._initStores = function _initStores(id) { + if (isUndefined(watches[id])) { + watches[id] = {}; + } + if (isUndefined(lazyWatches[id])) { + lazyWatches[id] = {}; + } + if (isUndefined(descriptions[id])) { + descriptions[id] = {}; + } + if (isUndefined(history[id])) { + history[id] = {}; + } + if (isUndefined(watchObjs[id])) { + watchObjs[id] = {}; + } + if (isUndefined(pointers[id])) { + pointers[id] = {}; + } + }; + + /** + * When an expression changes, store the information about it + * and increment a pointer. + * @param {string|Function} exp Expression + * @param {string} id Scope $id + * @param {Scope} locals AngularJS scope + * @param {boolean} pass Whether or not to pass on the first call + * @param {string} description AngularJS string to interpolate + * @return {Function} Watch function + * @private + */ + this._archive = function (exp, id, locals, pass, description) { + var _initStores = this._initStores; + return function (newVal, oldVal) { + var watchObj; + _initStores(id); + if (description) { + descriptions[id][exp] = $interpolate(description)(locals); + } + if (pass) { + pass = false; + return; + } + if (isUndefined(history[id][exp])) { + history[id][exp] = []; + } + if (isUndefined(pointers[id][exp])) { + pointers[id][exp] = 0; + } + history[id][exp].splice(pointers[id][exp] + 1); + history[id][exp].push(copy(newVal)); + pointers[id][exp] = history[id][exp].length - 1; + if (pointers[id][exp] > 0 && isDefined(watchObjs[id]) && + isDefined(watchObj = watchObjs[id][exp])) { + if (!batching) { + watchObj._fireChangeHandlers(exp, locals); + } + watchObj._broadcast('History.archived', { + expression: exp, + newValue: newVal, + oldValue: oldVal, + description: descriptions[id][exp], + locals: locals + }); + } + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#watch + * @method + * @methodOf decipher.history.service:History + * @description + * Register some expression(s) for watching. + * @param {string|string[]} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @returns {Watch|Array} {@link decipher.history.object:Watch Watch instance} or array of them + * + * @example + * + + + angular.module('decipher.history') + .run(function(History, $rootScope) { + $rootScope.foo = 'foo'; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + }); + + History.watch('foo', $rootScope, 'you changed the foo'); + }); + + + {{foo}}
    + {{message}}
    +     +     + */ + this.watch = function watch(exps, scope, description, lazyOptions) { + if (isUndefined(exps)) { + throw new Error('expression required'); + } + scope = scope || $rootScope; + description = description || ''; + var i, + id = scope.$id, + exp, + objs = [], + watchObj, + model; + + if (!isArray(exps)) { + exps = [exps]; + } + + this._initStores(id); + + i = exps.length; + while (i--) { + exp = exps[i]; + + // assert we have an assignable model + model = $parse(exp); + if (isUndefined(model.assign)) { + throw 'expression "' + exp + + '" is not an assignable expression'; + } + + // blast any old watches + if (isFunction(watches[id][exp])) { + watches[id][exp](); + } + + descriptions[id][exp] = $interpolate(description)(scope); + + this._watch(exp, scope, false, lazyOptions); + watchObjs[id][exp] = watchObj = new Watch(exp, scope); + objs.push(watchObj); + } + + return objs.length > 1 ? objs : objs[0]; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#deepWatch + * @method + * @methodOf decipher.history.service:History + * @description + * Allows you to watch an entire array/object full of objects, but only watch + * a certain property of each object. + * + * @example + * + + angular.module('decipher.history') + .run(function(History, $rootScope) { + var exp, locals; + + $rootScope.foos = [ + {id: 1, name: 'herp'}, + {id: 2, name: 'derp'} + ]; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + exp = data.expression; + locals = data.locals; + }) + + History.deepWatch('foo.name for foo in foos', $rootScope, + 'Changed {{foo.id}} to name "{{foo.name}}"') + .addChangeHandler('myChangeHandler', function($expression, + $locals, foo) { + console.log(foo); + console.log("(totally hit the server and update the model)"); + $rootScope.undo = function() { + History.undo($expression, $locals); + }; + $rootScope.canUndo = function() { + return History.canUndo($expression, $locals); + }; + }, {foo: 'foo'}); + }); + + + {{foos[0].name}}
    + {{message}}
    + +     +     + * @param {(string|string[])} exp Expression or array of expressions to watch + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @return {Watch} {@link decipher.history.object:Watch Watch instance} + */ + this.deepWatch = + function deepWatch(exp, scope, description, lazyOptions) { + var match, + targetName, + valueFn, + keyName, + value, + valueName, + valuesName, + watchObj, + id = scope.$id, + _clear = bind(this, this._clear), + _initStores = this._initStores, + _archive = bind(this, this._archive), + createDeepWatch = function createDeepWatch(targetName, valueName, + keyName, watchObj) { + return function (values) { + forEach(values, function (v, k) { + + var locals = scope.$new(), + id = locals.$id; + locals.$$deepWatchId = scope.$$deepWatch[targetName]; + locals.$$deepWatchTargetName = targetName; + locals[valueName] = v; + if (keyName) { + locals[keyName] = k; + } + value = valueFn(scope, locals); + + _initStores(id); + + descriptions[id][exp] = $interpolate(description)(locals); + + if (isFunction(watches[id][targetName])) { + watches[id][targetName](); + } + + if (lazyBindFound && isObject(lazyOptions)) { + watches[id][targetName] = + locals.$watch(lazyWatch(locals, targetName, + lazyOptions.timeout || 500), + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = true; + } + else { + watches[id][targetName] = locals.$watch(targetName, + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = false; + } + + watchObjs[id][targetName] = watchObj; + + locals.$on('$destroy', function () { + _clear(scope); + }); + + }); + + }; + }; + + description = description || ''; + if (!(match = exp.match(DEEPWATCH_EXP))) { + throw 'expected expression in form of "_select_ for (_key_,)? _value_ in _collection_" but got "' + + exp + '"'; + } + targetName = match[1]; + valueName = match[4] || match[2]; + valueFn = $parse(valueName); + keyName = match[3]; + valuesName = match[5]; + + if (isUndefined(scope.$$deepWatch)) { + scope.$$deepWatch = {}; + } + + // if we already have a deepWatch on this value, we + // need to kill all the child scopes. because reasons + if (isDefined(scope.$$deepWatch[targetName])) { + _clear(scope, targetName); + } + scope.$$deepWatch[targetName] = ++deepWatchId; + + _initStores(id); + watchObjs[id][targetName] = watchObj = new Watch(targetName, scope); + + // TODO: assert this doesn't leak memory like crazy. it might if + // we remove things from the values context. + watches[id][targetName] = scope.$watchCollection(valuesName, + createDeepWatch(targetName, valueName, keyName, + watchObj)); + + return watchObj; + }; + + /** + * Clears a bunch of information for a scope and optionally an array of expressions. + * Lacking an expression, this will eliminate an entire scopesworth of data. + * It will recognize deep watches and clear them out completely. + * @param {Scope} scope Scope obj + * @param {(string|string[])} exps Expression or array of expressions + * @private + */ + this._clear = function _clear(scope, exps) { + var id = scope.$id, + i, + nextSibling, + exp, + clear = function clear(id, key) { + var zap = function zap(what) { + if (isDefined(what[id][key])) { + delete what[id][key]; + if (Object.keys(what[id]).length === 0) { + delete what[id]; + } + } + }; + + if (isDefined(watches[id]) && + isFunction(watches[id][key])) { + watches[id][key](); + } + if (isDefined(watches[id])) { + zap(watches); + } + if (isDefined(watchObjs[id])) { + zap(watchObjs); + } + if (isDefined(history[id])) { + zap(history); + } + if (isDefined(pointers[id])) { + zap(pointers); + } + if (isDefined(lazyWatches[id])) { + zap(lazyWatches); + } + }, + + clearAll = function clearAll(id) { + forEach(watches[id], function (watch) { + return isFunction(watch) && watch(); + }); + delete watches[id]; + delete history[id]; + delete pointers[id]; + delete lazyWatches[id]; + delete watchObjs[id]; + }; + + if (isString(exps)) { + exps = [exps]; + } + else if (isUndefined(exps) && isDefined(watches[id])) { + exps = Object.keys(watches[id]); + } + + if (isDefined(exps)) { + i = exps.length; + while (i--) { + exp = exps[i]; + clear(id, exp); + } + } else { + clearAll(id); + } + nextSibling = scope.$$childHead; + while (nextSibling) { + this._clear(nextSibling, exp); + nextSibling = nextSibling.$$nextSibling; + } + }; + + + /** + * @ngdoc function + * @name decipher.history.service:History#forget + * @method + * @methodOf decipher.history.service:History + * @description + * Unregister some watched expression(s). + * @param {(string|string[])} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope object; defaults to $rootScope + */ + this.forget = function forget(scope, exps) { + scope = scope || $rootScope; + if (isDefined(exps) && isString(exps)) { + exps = [exps]; + } + this._clear(scope, exps); + }; + + /** + * Internal function to change some value in the stack to another. + * Kills the watch and then calls `_watch()` to restore it. + * @param {Scope} scope Scope object + * @param {string} exp AngularJS expression + * @param {array} stack History stack; see `History.history` + * @param {number} pointer Pointer + * @returns {{oldValue: {*}, newValue: {*}}} The old value and the new value + * @private + */ + this._do = function _do(scope, exp, stack, pointer) { + var model, + oldValue, + id = scope.$id; + if (isFunction(watches[id][exp])) { + watches[id][exp](); + delete watches[id][exp]; + } + model = $parse(exp); + oldValue = model(scope); + // todo: assert there's no bug here with unassignable expressions + model.assign(scope, copy(stack[pointer])); + this._watch(exp, scope, true); + return { + oldValue: oldValue, + newValue: model(scope) + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#undo + * @method + * @methodOf decipher.history.service:History + * @description + * Undos an expression to last known value. + * @param {string} exp Expression to undo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.undo = function undo(exp, scope) { + scope = scope || $rootScope; + if (isUndefined(exp)) { + throw new Error('expression required'); + } + var id = scope.$id, + scopeHistory = history[id], + stack, + values, + pointer, + watchObj; + + if (isUndefined(scopeHistory)) { + throw 'could not find history for scope ' + id; + } + + stack = scopeHistory[exp]; + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = --pointers[id][exp]; + if (pointer < 0) { + $log.warn('attempt to undo past history'); + pointers[id][exp]++; + return; + } + values = this._do(scope, exp, stack, pointer); + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireUndoHandlers(exp, scope); + watchObj._broadcast('History.undone', { + expression: exp, + newValue: values.newValue, + oldValue: values.oldValue, + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * Actually issues the appropriate scope.$watch + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {boolean=} pass Whether or not to skip the first watch execution. Defaults to false + * @param {Object} lazyOptions Options to send the lazy module + * @private + */ + this._watch = function _watch(exp, scope, pass, lazyOptions) { + var id; + scope = scope || $rootScope; + pass = pass || false; + id = scope.$id; + + // do we have an array or object? + if (lazyBindFound && (isObject(lazyOptions) || + (lazyWatches[id] && !!lazyWatches[id][exp]))) { + watches[id][exp] = + scope.$watch(lazyWatch(scope, exp, lazyOptions.timeout), + bind(this, this._archive(exp, id, scope, pass)), true); + lazyWatches[id][exp] = true; + } + else { + watches[id][exp] = + scope.$watch(exp, bind(this, this._archive(exp, id, scope, pass)), + true); + lazyWatches[id][exp] = false; + } + + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#redo + * @method + * @methodOf decipher.history.service:History + * @description + * Redoes (?) the last undo. + * @param {string} exp Expression to redo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.redo = function redo(exp, scope) { + scope = scope || $rootScope; + var id = scope.$id, + stack = history[id][exp], + values, + pointer, + watchObj; + + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = ++pointers[id][exp]; + if (pointer === stack.length) { + $log.warn('attempt to redo past history'); + pointers[id][exp]--; + return; + } + + values = this._do(scope, exp, stack, pointer); + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRedoHandlers(exp, scope); + watchObj._broadcast('History.redone', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canUndo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we have accumulated any history for a particular expression. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {boolean} Whether or not you can issue an `undo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canUndo = History.canUndo; + }); + + + Can undo? {{canUndo('foo')}} + + + */ + this.canUndo = function canUndo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] > 0; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canRedo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we can redo an expression's value. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {Boolean} Whether or not you can issue a `redo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canRedo = History.canRedo; + $rootScope.canUndo = History.canUndo; + $rootScope.undo = History.undo; + }); + + +
    +
    + Can redo? {{canRedo('foo')}} +     +     + */ + this.canRedo = function canRedo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] < history[id][exp].length - 1; + }; + + /** + * @ngdoc function + * @method + * @methodOf decipher.history.service:History + * @name decipher.history.service:History#revert + * @description + * Reverts to earliest known value of some expression, or at a particular + * pointer if you please. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {number=} pointer Optional; defaults to 0 + */ + this.revert = function (exp, scope, pointer) { + scope = scope || $rootScope; + pointer = pointer || 0; + var id = scope.$id, + stack = history[id][exp], + values, + watchObj; + + if (isUndefined(stack)) { + $log.warn('nothing to revert'); + return; + } + values = this._do(scope, exp, stack, pointer); + + // wait; what is this? + history[id][exp].splice(); + pointers[id][exp] = pointer; + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRevertHandlers(exp, scope); + watchObj._broadcast('History.reverted', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope, + pointer: pointer + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#batch + * @method + * @methodOf decipher.history.service:History + * @description + * Executes a function within a batch context which can then be rolled back. + * @param {function} fn Function to execute + * @param {Scope=} scope Scope object; defaults to `$rootScope` + * @param {string=} description Description of this change + * @returns {Watch} {@link decipher.history.object:Watch Watch instance} + * @example + + + angular.module('decipher.history').run(function(History, $rootScope) { + var t; + + $rootScope.herp = 'derp'; + $rootScope.bar = 'baz'; + $rootScope.frick = 'frack'; + + $rootScope.$on('History.batchEnded', function(evt, data) { + t = data.transaction; + }); + + History.watch('herp'); + History.watch('bar'); + History.watch('frick'); + + $rootScope.batch = function() { + History.batch(function() { + $rootScope.herp = 'derp2'; + $rootScope.bar = 'baz2'; + $rootScope.frick = 'frack2'; + }) + .addRollbackHandler('myRollbackHandler', function() { + $rootScope.message = 'rolled a bunch of stuff back'; + }); + $rootScope.message = "batch complete"; + }; + + $rootScope.rollback = function() { + if (isDefined(t)) { + History.rollback(t); + } + }; + }); + + +
      +
    • herp: {{herp}}
      • +
    • bar: {{bar}}
      • +
    • frick: {{frick}}
      • +
    + +
    + {{message}} +     +     + */ + this.batch = function batch(fn, scope, description) { + var _clear = bind(this, this._clear), + _initStores = this._initStores, + listener, + watchObj, + child; + scope = scope || $rootScope; + if (!isFunction(fn)) { + throw new Error('transaction requires a function'); + } + + child = scope.$new(); + child.$on('$destroy', function () { + _clear(child); + }); + + listener = scope.$on('History.archived', function (evt, data) { + var deepChild, + exp = data.expression, + id; + if (data.locals.$id !== child.$id) { + deepChild = child.$new(); + deepChild.$on('$destroy', function () { + _clear(deepChild); + }); + deepChild.$$locals = data.locals; + id = deepChild.$id; + _initStores(id); + history[id][exp] = + copy(history[data.locals.$id][exp]); + pointers[id][exp] = pointers[data.locals.$id][exp] - 1; + } + }); + + watchObjs[child.$id] = watchObj = new Watch(null, child); + watchObj._broadcast('History.batchBegan', { + transaction: child, + description: description + }); + + // we need to put this into a timeout and apply manually + // since it's not clear when the watchers will get fired, + // and we must ensure that any existing watchers on the archived + // event can be skipped before the batchEnd occurs. + batching = true; + $timeout(function () { + fn(child); + scope.$apply(); + }) + .then(function () { + listener(); + batching = false; + watchObj._broadcast('History.batchEnded', { + transaction: child, + description: description + }); + }); + + + return watchObj; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#rollback + * @method + * @methodOf decipher.history.service:History + * @description + * Rolls a transaction back that was executed via {@link decipher.history.service:History#batch batch()}. + * + * For an example, see {@link decipher.history.service:History#batch batch()}. + * @param {Scope} t Scope object in which the transaction was executed. + */ + this.rollback = function rollback(t) { + + var _do = bind(this, this._do), + parent = t.$parent, + packets = {}, + nextSibling, + watchObj, + nextSiblingLocals; + if (!t || !isObject(t)) { + throw new Error('must pass a scope to rollback'); + } + + function _rollback(scope, comparisonScope) { + var id = scope.$id, + comparisonScopeId = comparisonScope.$id, + stack = history[id], + pointer, + descs, + exp, + values, + exps, + rolledback, + i; + if (stack) { + exps = Object.keys(stack); + i = exps.length; + } else { + // might not actually have history, it's ok + return; + } + while (i--) { + exp = exps[i]; + values = []; + descs = []; + pointer = pointers[comparisonScopeId][exp]; + rolledback = false; + while (pointer > pointers[id][exp]) { + pointer--; + values.push(_do(comparisonScope, + exp, history[comparisonScopeId][exp], pointer)); + pointers[comparisonScopeId][exp] = pointer; + descs.push(descriptions[comparisonScopeId][exp]); + // throw this off the history stack so + // we don't end up with it in the stack while we + // do normal undo() calls later against the same + // expression and scope + history[comparisonScopeId][exp].pop(); + rolledback = true; + } + if (rolledback) { + packets[exp] = { + values: values, + scope: scope, + comparisonScope: comparisonScope, + descriptions: descs + }; + } + } + } + + watchObj = watchObjs[t.$id]; + + if (isDefined(parent) && + isDefined(history[parent.$id])) { + _rollback(t, parent); + } + nextSibling = t.$$childHead; + while (nextSibling) { + nextSiblingLocals = nextSibling.$$locals; + if (nextSiblingLocals) { + _rollback(nextSibling, nextSiblingLocals); + } + nextSibling = nextSibling.$$nextSibling; + } + watchObj._fireRollbackHandlers(); + watchObj._broadcast('History.rolledback', packets); + + }; + + /** + * @ngdoc property + * @name decipher.history.service:History#history + * @propertyOf decipher.history.service:History + * @description + * The complete history stack, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.history = history; + + /** + * @ngdoc property + * @name decipher.history.service:History#descriptions + * @propertyOf decipher.history.service:History + * @description + * The complete map of change descriptions, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.descriptions = descriptions; + + /** + * @ngdoc property + * @name decipher.history.service:History#pointers + * @propertyOf decipher.history.service:History + * @description + * The complete pointer map, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.pointers = pointers; + + /** + * @ngdoc property + * @name decipher.history.service:History#watches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.watches = watches; + + /** + * @ngdoc property + * @name decipher.history.service:History#lazyWatches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es designated to be "lazy", keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.lazyWatches = lazyWatches; + + /** + * @ngdoc property + * @name decipher.history.service:History#watchObjs + * @propertyOf decipher.history.service:History + * @description + * The complete index of all {@link decipher.history.object:Watch Watch} objects registered, keyed by Scope `$id` and then (optionally) expression. + * @type {{}} + */ + this.watchObjs = watchObjs; + + /** + * @ngdoc property + * @name decipher.history.service:History#Watch + * @propertyOf decipher.history.service:History + * @description + * Here's the Watch prototype for you to play with. + * @type {Watch} + */ + this.Watch = Watch; + }]); +})(); diff --git a/scripts/libs/angular-history/package.json b/scripts/libs/angular-history/package.json new file mode 100644 index 0000000000..acdcc7e58d --- /dev/null +++ b/scripts/libs/angular-history/package.json @@ -0,0 +1,51 @@ +{ + "_from": "github:decipherinc/angular-history#v0.8.0", + "_id": "angular-history@0.8.0", + "_inBundle": false, + "_integrity": "", + "_location": "/angular-history", + "_phantomChildren": {}, + "_requested": { + "type": "git", + "raw": "angular-history@github:decipherinc/angular-history#v0.8.0", + "name": "angular-history", + "escapedName": "angular-history", + "rawSpec": "github:decipherinc/angular-history#v0.8.0", + "saveSpec": "github:decipherinc/angular-history#v0.8.0", + "fetchSpec": null, + "gitCommittish": "v0.8.0" + }, + "_requiredBy": [ + "/superdesk-core" + ], + "_resolved": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", + "_spec": "angular-history@github:decipherinc/angular-history#v0.8.0", + "_where": "/home/petr/dev/superdesk/client/node_modules/superdesk-core", + "bugs": { + "url": "https://github.com/decipherinc/angular-history/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) ===============", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-bower-install-simple": "^1.1.3", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-connect": "^0.10.1", + "grunt-contrib-qunit": "^0.7.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-ngdocs": "^0.2.7" + }, + "homepage": "https://github.com/decipherinc/angular-history#readme", + "license": "MIT", + "name": "angular-history", + "repository": { + "type": "git", + "url": "git://github.com/decipherinc/angular-history.git" + }, + "scripts": { + "test": "grunt test" + }, + "version": "0.8.0" +} From 1e116b8f0aa2d87ca25d8d1dff2154a3b88b76a5 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Fri, 15 Mar 2024 11:27:34 +0100 Subject: [PATCH 0993/1070] Revert "fix(install): Remove angular-history from packages" This reverts commit d763ac783e5d25c96c145fb8bc8999f8ff2117fc. --- package-lock.json | 4 ++++ package.json | 1 + scripts/apps/authoring/authoring/index.ts | 3 +++ 3 files changed, 8 insertions(+) diff --git a/package-lock.json b/package-lock.json index e2660435d6..a3c5927296 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1605,6 +1605,10 @@ "pofile": "~1.0.0" } }, + "angular-history": { + "version": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", + "from": "github:decipherinc/angular-history#v0.8.0" + }, "angular-i18n": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.6.9.tgz", diff --git a/package.json b/package.json index d8095d3119..ed09183df2 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", + "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", "angular-mocks": "1.6.9", "angular-moment": "1.2.0", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 45924ada13..2af5600dde 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -1,3 +1,5 @@ +import 'angular-history/history'; + import * as svc from './services'; import * as directive from './directives'; import * as ctrl from './controllers'; @@ -83,6 +85,7 @@ angular.module('superdesk.apps.authoring', [ 'superdesk.apps.vocabularies', 'superdesk.apps.relations', 'contenteditable', + 'decipher.history', 'superdesk.config', 'angular-embed', mediaModule.name, From d78a0270f70fb57b33a121d462f1b6acd0994b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 15 Mar 2024 11:26:12 +0100 Subject: [PATCH 0994/1070] add angular-history library (#4454) * add angular-history library it's gone from github * fix import --- .eslintignore | 3 +- package-lock.json | 8 +- package.json | 1 - scripts/apps/authoring/authoring/index.ts | 2 +- scripts/libs/angular-history/LICENSE | 20 + scripts/libs/angular-history/README.md | 463 +++++++ scripts/libs/angular-history/history.js | 1525 +++++++++++++++++++++ scripts/libs/angular-history/package.json | 51 + 8 files changed, 2064 insertions(+), 9 deletions(-) create mode 100644 scripts/libs/angular-history/LICENSE create mode 100644 scripts/libs/angular-history/README.md create mode 100644 scripts/libs/angular-history/history.js create mode 100644 scripts/libs/angular-history/package.json diff --git a/.eslintignore b/.eslintignore index c16c049c43..5754cdf197 100644 --- a/.eslintignore +++ b/.eslintignore @@ -10,4 +10,5 @@ superdesk-common/dist e2e/client/node_modules e2e/client/dist e2e/client/**/*.js -build-tools/** \ No newline at end of file +build-tools/** +scripts/libs/* \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a3c5927296..927b29e164 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1605,10 +1605,6 @@ "pofile": "~1.0.0" } }, - "angular-history": { - "version": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", - "from": "github:decipherinc/angular-history#v0.8.0" - }, "angular-i18n": { "version": "1.6.9", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.6.9.tgz", @@ -16696,7 +16692,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -17429,7 +17425,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" }, "svgo": { "version": "0.7.2", diff --git a/package.json b/package.json index ed09183df2..d8095d3119 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", "angular-gettext": "github:tomaskikutis/angular-gettext#master", - "angular-history": "github:decipherinc/angular-history#v0.8.0", "angular-i18n": "1.6.9", "angular-mocks": "1.6.9", "angular-moment": "1.2.0", diff --git a/scripts/apps/authoring/authoring/index.ts b/scripts/apps/authoring/authoring/index.ts index 2af5600dde..ee2ab90070 100644 --- a/scripts/apps/authoring/authoring/index.ts +++ b/scripts/apps/authoring/authoring/index.ts @@ -1,4 +1,4 @@ -import 'angular-history/history'; +import 'libs/angular-history/history'; import * as svc from './services'; import * as directive from './directives'; diff --git a/scripts/libs/angular-history/LICENSE b/scripts/libs/angular-history/LICENSE new file mode 100644 index 0000000000..cdc07da2cb --- /dev/null +++ b/scripts/libs/angular-history/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Decipher Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/scripts/libs/angular-history/README.md b/scripts/libs/angular-history/README.md new file mode 100644 index 0000000000..9de45346a3 --- /dev/null +++ b/scripts/libs/angular-history/README.md @@ -0,0 +1,463 @@ +angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) +=============== + +A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to +do with the "back" button, unless you want it to. + +Current Version +=============== +``` +0.7.5 +``` + +*Fair warning:* Until this project is at `1.0.0` the API is subject to change +and will likely break. + +Installation +============ + +``` +bower install angular-history +``` + +Requirements +============ + +- AngularJS 1.1.x+ +- [ngLazyBind](https://github.com/Ticore/ngLazyBind) (optional) + +Running Tests +------------- + +Clone this repo and execute: + +``` +npm install +``` + +to grab the dependencies. Then execute: + +``` +grunt test +``` + +to run the tests. This will grab the test deps from [bower](http://bower.io), +and run them against [QUnit](http://qunitjs.com) in a local server on port 8000. + +API Documentation +================= + +[API Documentation](http://decipherinc.github.io/angular-history/docs) + +Demo +==== + +For now, some in the [API documentation](http://decipherinc.github.io/angular-history/docs). + +Usage +===== + +First, include the `decipher.history` module in your application: + +```javascript +angular.module('myApp', ['decipher.history']); +``` + +Next, you will want to inject the `History` service into your component: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + // ... +}); +``` + +Optionally, you can grab the [ngLazyBind](https://github.com/Ticore/ngLazyBind) +module if you want to support lazy binding. This becomes useful if you have +say, an `` field, and you don't want every keystroke recorded +in the history. If this module is present, the `History` service will provide +extra options. + +Watching an Expression +---------------------- + +You will want to give the `History` service an expression to watch: + +```javascript +angular.module('myApp').controller('MyCtrl', function($scope, History) { + $scope.foo = 'bar'; + History.watch('foo', $scope); +}); +``` + +An optional third parameter is the `description`, which will be emitted when an +item is archived, undone, redone, or reverted, via a `$broadcast()`. This +allows you to attach to the event and do something with the info, such as pop up + an alert with an "undo" button in it. This value is interpolated against the + passed `$scope` object. + +If you have the `ngLazyBind` module, you may provide a fourth parameter to +`History.watch()`: + +```javascript +History.watch('foo', $scope, 'Foo changed to {{foo}}', {timeout: 500}); +``` + +This tells the history stack to update no more often than every 500ms. This +value defaults to 1s. If you wish to use lazy binding with the default, then +simply pass an empty object `{}` as the fourth parameter. If you do not have +the `ngLazyBind` module installed, this object will simply be ignored. + +The `Watch` Object +------------------ + +Whenever you issue one of the following commands, you will receive a `Watch` +object: + +- `History.watch()` +- `History.deepWatch()` +- `History.batch()` + +This provides another layer of functionality on top of the events that the +`History` service will broadcast. You can use these *chainable* objects to run +callbacks depending on the type of action that was taken: + +```javascript +var w = History.watch('foo') + .addChangeHandler('myChangeHandler', function() { + console.log('foo got changed'); + }) + .addUndoHandler('myUndoHandler', function() { + console.log('undid foo. this message will self-destruct'); + w.removeUndoHandler('myUndoHandler'); + }); +``` + +The general recommendation is to listen for the global events if you want +general functionality, and to use these `Watch` object callbacks for specific +functionality. + +Undoing/Redoing +--------------- + +Once something is `watch()`ed, you can undo or redo changes to it, *if that +expression is assignable*. If you pass a function as the expression, you may +*not* undo/redo, but you will still have access to the history stack. + +Anyway, to undo, execute: + +```javascript +History.undo('foo', $scope); +``` + +The `$scope` will be updated with the most recent version of the object. You +can `undo()` as many times as there are changes in the expression's value since +you `watch()`ed it--this is an entire history stack. + +Furthermore, an event will be emitted. The `$rootScope` will `$broadcast()` a +`History.undone` event with the following information: + +- `expression`: The expression that was undone +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to +- `description`: The optional `description` you may have passed +- `scope`: The scope passed to `undo()` + +Redoing is pretty much as you would expect: + +```javascript +History.redo('foo', $scope); +``` + +This only works if you have previously undone something, of course. You can +undo multiple times, then redo multiple times. The event emitted after redo is +`History.redone` and the information is the same. + +Use `History.canUndo(exp, scope)` and `History.canRedo(exp, scope)` if you need +to know those things. + +Revert +------ + +You can revert to the original value at the time of the `watch()` instruction by +issuing: + +```javascript +History.revert('foo', $scope); +``` + +If you are looking at `History.history` and know where in the stack you want to +go, pass a third parameter and you will revert to a specific revision in the +stack: + +```javascript +History.revert('foo', $scope, 23); +``` + +...which will revert directly to the 23rd revision, no questions asked. + +In addition, the `History.reverted` event will return to you the `pointer` that +you passed it (which is `0` by default). + +Forgetting +---------- + +If you want to stop watching an expression for changes, issue: + +```javascript +History.forget($scope, 'foo'); +``` + +The history will be purged and the watch will be removed. Note that the `$scope` parameter comes first. If you omit the second parameter, all of the history data and watches for the scope will be destroyed. If you omit the first parameter, this will wipe the entire History service. + +Fanciness: Deep Watching +------------------------ + +Maybe it could use a different name, but often situations arise where you want +to watch an entire array of objects for a change in any of those objects' +properties. It would be incredibly inefficient to watch the entire array/object +for changes, and you wouldn't necessarily know what property got updated. + +"Deep watch" like so: + +```javascript +$scope.foos = [ + {id: 1, name: 'winken'}, + {id: 2, name: 'blinken'}, + {id: 3, name: 'nod'} +]; +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); +``` + +This works for objects as well: + +```javascript +$scope.foos = { + '1': {name: 'fe'}, + '2': {name: 'fi'}, + '3': {name: 'fo'}, + '4': {name: 'fum'} +}; +History.deepWatch('value.name for (key, value) in foos', $scope, + 'Foo with ID {{key}} changed its name to {{value.name}}'); +``` + +Now, whenever a name of any one of those things changes, history will be put on +the stack. + +There are two ways to handle this. + +### Listen for an event + +The first is to listen for the `History.archived` event: + +```javascript +History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +$scope.$on('History.archived', function(evt, data) { + $scope.undo = function() { + History.undo(data.expression, data.locals); + }; +}); + +$scope.foos[0].name = 'fuh'; + +``` + +So you can bind to `undo()` in your view, and it will undo the change to +`foos[0].name`. + +`data`, as passed to the event handler, will look similar to the +`History.undone` event as mentioned above: + +- `expression`: The expression that got archived, local to `locals` +- `oldValue`: The value the expression was changed from. This is a copy! +- `newValue`: The value the expression was changed to. +- `description`: The optional `description` you may have passed +- `locals`: A scope containing your expression's value. For example, above we +will have the object `f` available in `locals`, with a `name` property. + +### Use a handler + +The second way is to use a handler built into a `Watch` object: + +```javascript +var w = History.deepWatch('f.name for f in foos', $scope, + 'Foo with ID {{f.id}} changed to {{f.name}}'); + +w.addChangeHandler('myChangeHandler', function($expression, $locals, foo) { + $scope.undo = function() { + console.log('undoing foo with name "' + foo.name + '"'); + History.undo($expression, $locals); + }); +}, {foo: 'f'}); + +$scope.foos[0].name = 'fuh'; + +``` + +There are two special injections into your change/undo/redo/etc. handlers: + +- `$expression` The expression that changed. This may be simple, like `foo`, +or complex like `f.name` if you have used a deep watch. +- `$locals` The scope against which the change was made. If this is simple, +like in the case of a `History.watch()`, you probably don't need it. But if +you are doing a deep watch, then you will want to use this, because it does not +represent the scope you originally started with! + +`$expression` is not available in rollback handlers (discussed later). + +Otherworldly Fanciness: Batching +-------------------------------- + +You can group a bunch of changes together and undo them all at once. Note that +currently you must actually be watching the changed variables in some manner; +you must use `watch()` or `deepWatch()` first, then issue the batch. + +```javascript +// setup some data +scope.$apply('foo = [1,2,3]'); +scope.$apply('bar = "baz"'); +scope.$apply(function () { + scope.data = [ + {id: 1, name: 'foo'}, + {id: 2, name: 'bar'}, + {id: 3, name: 'baz'} + ]; + scope.otherdata = { + 1: { + name: 'foo' + }, + 2: { + name: 'bar' + }, + 3: { + name: 'baz' + } + }; +}); + +// watch some of these things through various means +History.watch('foo', scope, 'foo array changed'); +History.watch('bar', scope, 'bar string changed'); +History.deepWatch('d.name for d in data', scope, 'name in data changed'); +History.deepWatch('od.name for (key, od) in otherdata', scope, + 'name in otherdata changed'); + +// change some things outright +scope.$apply('pigs = "chickens"'); +scope.$apply('foo = [4,5,6]'); +``` + +Next we'll initiate a batch. You will receive a special new scope within your +`Watch` object that you can then pass to `History.rollback()`, which will roll +back all changes made within the batch closure. See below. + +The function you pass to `History.batch()` will accept a scope parameter, and +that is actually a child scope of the real scope. Changes are made here and +propagated to the parent's history. + +Note the second parameter, which is optional and defaults to `$rootScope`, +just like the other functions in the API. + +```javascript +var w = History.batch(function (child) { + child.$apply('foo[0] = 7'); + child.$apply('foo[1] = 8'); + child.$apply('foo[2] = 9'); // 3 changes to "foo" + child.$apply('data[0].name = "marvin"'); // one change to the "data" array + child.$apply('otherdata[1].name = "pookie"'); // one change to the "otherdata" array + child.$apply('bar = "spam"'); // change to a string + child.$apply('pigs = "cows"'); // change to something *not* watched +}, scope); +``` + +*You do not have to use the `child` variable unless you want to*. It's +perfectly legit, if you are in a digest loop already, to just make assignments. +The following is equivalent, again, if you are already in a digest (if you are +using this code in a controller, you are likely in a digest; if you're using +it in a directive, you may or may not be depending on what you're up to): + +```javascript +var w = History.batch(function (child) { + scope.foo[0] = 7; + scope.foo[1] = 8; + scope.foo[2] = 9; + scope.data[0].name = "marvin"; + scope.otherdata[1].name = "pookie"; + scope.bar = "spam"; + scope.pigs = "cows"; +}, scope); +``` + +Let's make sure to notify our lovely `console` that a rollback happened: + +```javascript +w.addRollbackHandler('myRollbackHandler', function($locals) { + // $locals is the same as the "transaction" property of the watch object "w" + console.log('a rollback happened against scope ' + $locals.$id); +}); +``` + +Now let's issue a rollback. Note that you can also listen for the +`History.batchBegan` and `History.batchEnded` events that are broadcast from the +`$rootScope`, if you want to implement more general functionality. + +```javascript +var transaction = w.transaction; +History.rollback(transaction); +``` + +Let's see what we ended up with by viewing some assertions: + +```javascript +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); +Q.equal(scope.bar, 'baz', 'bar is again baz'); +// no change here, because we didn't watch "pigs" +Q.equal(scope.pigs, 'cows', 'pigs is still cows (no change)'); +Q.equal(scope.data[0].name, 'foo', 'data[0].name is again "foo"'); +Q.equal(scope.otherdata[1].name, 'foo', 'otherdata[1].name is again foo'); + +// see that you can undo further in some cases +History.undo('foo', scope); +Q.deepEqual(scope.foo, [1, 2, 3], 'foo is again [1,2,3]'); + +// see you can redo again +History.redo('foo', scope); +Q.deepEqual(scope.foo, [4, 5, 6], 'foo is again [4,5,6]'); + +// but also that you can't redo past the rollback. +// I suppose this could change, but it would put a lot +// of extra crap in the history. +Q.ok(!History.canRedo('foo', scope), 'assert no more history'); +``` + +This batching hasn't been tested with the "lazy" functionality mentioned earlier +(yet), but it will certainly help you support mass changes to many variables at +once, and be able to report those changes to the user. + +Internals +--------- +To debug, you can grab the stack itself by asking the service for it: + +```javascript +console.log(History.history); +``` + +Properties of the `History` service include: + +- `history` (the complete history stack for all of the scopes and expressions) +- `pointers` (which keeps a pointer to the index in the `history` we are at) +- `watches` (which are the actual `$watch` functions on the Scope objects) +- `lazyWatches` (which are the stored "lazy" watches if you are using them) +- `watchObjs` (which stores all `Watch` objects created) +- `descriptions` (which stores any `description` parameters passed to `watch()`) + +Author +====== + +[Christopher Hiller](http://boneskull.github.io) at +[Decipher, Inc.](http://decipherinc.github.io) + + diff --git a/scripts/libs/angular-history/history.js b/scripts/libs/angular-history/history.js new file mode 100644 index 0000000000..82440ca4e8 --- /dev/null +++ b/scripts/libs/angular-history/history.js @@ -0,0 +1,1525 @@ +/*global angular*/ + +/** + * @ngdoc overview + * @name decipher.history + * @description + * A history service for AngularJS. Undo/redo, that sort of thing. Has nothing to do with the "back" button, unless you want it to. + * + */ +(function () { + 'use strict'; + + var DEEPWATCH_EXP = /^\s*(.*?)\s+for\s+(?:([\$\w][\$\w\d]*)|(?:\(\s*([\$\w][\$\w\d]*)\s*,\s*([\$\w][\$\w\d]*)\s*\)))\s+in\s+(.*?)$/, + DEFAULT_TIMEOUT = 1000, + lazyBindFound = false, + isDefined = angular.isDefined, + isUndefined = angular.isUndefined, + isFunction = angular.isFunction, + isArray = angular.isArray, + isString = angular.isString, + isObject = angular.isObject, + forEach = angular.forEach, + copy = angular.copy, + bind = angular.bind; + + /** + * Polyfill for Object.keys + * + * @see: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/keys + */ + if (!Object.keys) { + Object.keys = (function () { + var hasOwnProperty = Object.prototype.hasOwnProperty, + hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), + dontEnums = [ + 'toString', + 'toLocaleString', + 'valueOf', + 'hasOwnProperty', + 'isPrototypeOf', + 'propertyIsEnumerable', + 'constructor' + ], + dontEnumsLength = dontEnums.length; + + return function (obj) { + if (typeof obj !== 'object' && typeof obj !== 'function' || + obj === null) { + throw new TypeError('Object.keys called on non-object'); + } + + var result = []; + + for (var prop in obj) { + if (hasOwnProperty.call(obj, prop)) { + result.push(prop); + } + } + + if (hasDontEnumBug) { + for (var i = 0; i < dontEnumsLength; i++) { + if (hasOwnProperty.call(obj, + dontEnums[i])) { + result.push(dontEnums[i]); + } + } + } + return result; + }; + })(); + } + + // stub out lazyBind if we don't have it. + try { + angular.module('lazyBind'); + lazyBindFound = true; + } + catch (e) { + angular.module('lazyBind', []).factory('$lazyBind', function() {return angular.noop}); + } + + /** + * @ngdoc service + * @name decipher.history.service:History + * @description + * Provides an API for keeping a history of model values. + */ + angular.module('decipher.history', ['lazyBind']).service('History', + [ + '$parse', + '$rootScope', + '$interpolate', + '$lazyBind', + '$timeout', + '$log', + '$injector', + function ($parse, $rootScope, $interpolate, $lazyBind, $timeout, $log, + $injector) { + var service = this, + history = {}, + pointers = {}, + watches = {}, + watchObjs = {}, + lazyWatches = {}, + descriptions = {}, + // TODO: async safe? + batching = false, // whether or not we are currently in a batch + deepWatchId = 0; // incrementing ID of deep {@link decipher.history.object:Watch Watch instance}s + + /** + * @ngdoc object + * @name decipher.history.object:Watch + * @overview + * @constructor + * @description + * An object instance that provides several methods for executing handlers after + * certain changes have been made. + * + * Each function return the `Watch` instance, so you can chain the calls. + * + * See the docs for {@link decipher.history.service:History#deepWatch History.deepWatch()} for an example of using these functions. + * + * @todo ability to remove all handlers at once, or all handlers of a certain type + */ + var Watch = function Watch(exp, scope) { + this.exp = exp; + this.scope = scope || $rootScope; + + this.$handlers = { + $change : {}, + $undo : {}, + $rollback : {}, + $redo : {}, + $revert : {}, + }; + + this.$ignores = {}; + }; + + /** + * @description + * Helper method for the add*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @param {Function} fn Handler function to execute + * @param {Object} resolve Mapping of function parameters to values + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._addHandler = + function _addHandler(where, name, fn, resolve) { + if (!where || !name || !fn) { + throw new Error('invalid parameters to _addHandler()'); + } + this.$handlers[where][name] = { + fn: fn, + resolve: resolve || {} + }; + return this; + }; + + /** + * @description + * Helper method for remove*Handler functions. + * @param {string} where Type of handler, corresponds to object defined in constructor + * @param {string} name Name of handler to be supplied by user + * @private + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype._removeHandler = function (where, name) { + if (!name) { + throw new Error('invalid parameters to _removeHandler()'); + } + delete this.$handlers[where][name]; + return this; + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#addChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a change handler function with name `name` to be executed + * whenever a value matching this watch's expression changes (is archived). + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addChangeHandler = + function addChangeHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$change', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds an undo handler function with name `name` to be executed + * whenever a value matching this watch's expression is undone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addUndoHandler = + function addUndoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$undo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a redo handler function with name `name` to be executed + * whenever a value matching this watch's expression is redone. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRedoHandler = + function addRedoHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$redo', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a revert handler function with name `name` to be executed + * whenever a value matching this watch's expression is reverted. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRevertHandler = + function addRevertHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$revert', name, fn, resolve); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#addRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Unique name of handler + * @param {Function} fn Function to execute upon change + * @param {object} resolve Mapping of function parameters to values + * @description + * Adds a rollback handler function with name `name` to be executed + * whenever the batch tied to this watch is rolled back. + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + */ + Watch.prototype.addRollbackHandler = + function addRollbackHandler(name, fn, resolve) { + if (!name || !fn) { + throw new Error('invalid parameters'); + } + return this._addHandler('$rollback', name, fn, resolve); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRevertHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a revert handler with name `name`. + */ + Watch.prototype.removeRevertHandler = function removeRevertHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$revert', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeChangeHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a change handler with name `name`. + */ + Watch.prototype.removeChangeHandler = function removeChangeHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$change', name); + }; + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeUndoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a undo handler with name `name`. + */ + Watch.prototype.removeUndoHandler = function removeUndoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$undo', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRollbackHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a rollback handler with name `name`. + */ + Watch.prototype.removeRollbackHandler = + function removeRollbackHandler(name) { + return this._removeHandler('$rollback', name); + }; + + /** + * @ngdoc function + * @name decipher.history.object:Watch#removeRedoHandler + * @methodOf decipher.history.object:Watch + * @method + * @param {string} name Name of handler to remove + * @returns {Watch} This {@link decipher.history.object:Watch Watch instance} + * @description + * Removes a redo handler with name `name`. + */ + Watch.prototype.removeRedoHandler = + function removeRedoHandler(name) { + if (!name) { + throw new Error('invalid parameters'); + } + return this._removeHandler('$redo', name); + }; + + /** + * Fires all handlers for a particular type, optionally w/ a scope. + * @param {string} where Watch type + * @param {string} exp Expression + * @param {Scope} [scope] Optional Scope + * @private + */ + Watch.prototype._fireHandlers = + function _fireHandlers(where, exp, scope) { + var hasScope = isDefined(scope), + localScope = this.scope, that = this; + forEach(this.$handlers[where], function (handler) { + var locals = { + $locals: localScope + }; + if (isDefined(scope)) { + locals.$locals = scope; + } + if (isDefined(exp)) { + locals.$expression = exp; + } + forEach(handler.resolve, function (value, key) { + if (hasScope) { + locals[key] = $parse(value)(scope); + } else { + locals[key] = value; + } + }); + $injector.invoke(handler.fn, scope || that, locals); + }); + }; + + /** + * Fires the change handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireChangeHandlers = + function _fireChangeHandlers(exp, scope) { + this._fireHandlers('$change', exp, scope); + }; + + /** + * Fires the undo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireUndoHandlers = + function _fireUndoHandlers(exp, scope) { + this._fireHandlers('$undo', exp, scope); + }; + + /** + * Fires the redo handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRedoHandlers = + function _fireRedoHandlers(exp, scope) { + this._fireHandlers('$redo', exp, scope); + }; + + /** + * Fires the revert handlers + * @param {Scope} scope Scope + * @param {string} exp Expression + * @private + */ + Watch.prototype._fireRevertHandlers = + function _fireRevertHandlers(exp, scope) { + this._fireHandlers('$revert', exp, scope); + }; + + /** + * Fires the rollback handlers (note lack of scope and expression) + * @private + */ + Watch.prototype._fireRollbackHandlers = + function _fireRollbackHandlers() { + this._fireHandlers('$rollback'); + }; + + /** + * Decline to broadcast an event for this Watch. + * @param {string} eventName Name of event to avoid. i.e. "History.archived" + * @param {Function=} callback Optional callback + * @param {Object=} resolve Optional mapping of parameters to invoke + * the callback with. + * @returns {Watch} this Watch object + */ + Watch.prototype.ignoreEvent = + function ignoreEvent(eventName, callback, resolve) { + // special case; we cannot ignore History.archived within a Watch obj + // created from a batch. there may be a way around this. + if (this.exp === null && eventName === 'History.archived') { + $log.warn('cannot ignore History.archived event for batch'); + return this; + } + resolve = resolve || {}; + if (isFunction(callback)) { + this.$ignores[eventName] = { + callback: callback, + resolve: resolve + }; + } else if (isDefined(callback)) { + this.$ignores[eventName] = { + callback: function cb() { + return callback; + }, + resolve: resolve + }; + } + return this; + }; + + /** + * Broadcasts an event, taking ignored events into account. + * @param {string} eventName Event to broadcast + * @param {*} data Some data to pass + * @private + */ + Watch.prototype._broadcast = function _broadcast(eventName, data) { + var ignore = this.$ignores[eventName]; + if (!ignore || + (isFunction(ignore.callback) && + !$injector.invoke(ignore.callback, this.scope, angular.extend(ignore.resolve, {$data: data})))) { + $rootScope.$broadcast(eventName, data); + } + }; + + /** + * Undoes last change against this watch object's target. + */ + Watch.prototype.undo = function undo() { + if (this.exp === null) { + $log.warn("attempt to undo a batch; use rollback() instead"); + return; + } + service.undo(this.exp, this.scope); + }; + + /** + * Redoes last undo against this watch object's target. + */ + Watch.prototype.redo = function redo() { + if (this.exp === null) { + $log.warn("attempt to redo a batch; just execute the batch callback again"); + } + service.redo(this.exp, this.scope); + }; + + /** + * Reverts this target's watch object. + * @param {number=0} pointer Pointer to revert to + */ + Watch.prototype.revert = function revert(pointer) { + if (this.exp === null) { + $log.warn("attempt to revert a batch; use rollback() instead"); + } + service.revert(this.exp, this.scope, pointer); + }; + + /** + * Whether or not you may undo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canUndo = function canUndo() { + return this.exp === null ? false : + service.canUndo(this.exp, this.scope); + }; + + /** + * Whether or not you may redo this watch object's target + * @returns {boolean} + */ + Watch.prototype.canRedo = function canRedo() { + return this.exp === null ? false : + service.canRedo(this.exp, this.scope); + }; + + /** + * Evaluates an expression on the scope lazily. That means it will return + * a new value every DEFAULT_TIMEOUT ms at maximum, even if you change it between + * now and then. This allows us to $broadcast at an interval instead of after + * every scope change. + * @param {Object} scope AngularJS Scope + * @param {string} exp AngularJS expression to evaluate + * @param {number} [timeout=DEFAULT_TIMEOUT] How often to change the value + * @returns {Function} + */ + var lazyWatch = function lazyWatch(scope, exp, timeout) { + var bind = $lazyBind(scope); + bind.cacheTime(timeout || DEFAULT_TIMEOUT); + + /** + * This is the "expression function" we use to $watch with. You normally + * $watch a string, but you can also watch a function, and this is one of + * those functions. This is where the actual lazy evaluation happens. + */ + return function () { + return bind.call(scope, exp); + }; + }; + + /** + * Initializes object stores for a Scope id + * @param {string} id Sccope id + * @private + */ + this._initStores = function _initStores(id) { + if (isUndefined(watches[id])) { + watches[id] = {}; + } + if (isUndefined(lazyWatches[id])) { + lazyWatches[id] = {}; + } + if (isUndefined(descriptions[id])) { + descriptions[id] = {}; + } + if (isUndefined(history[id])) { + history[id] = {}; + } + if (isUndefined(watchObjs[id])) { + watchObjs[id] = {}; + } + if (isUndefined(pointers[id])) { + pointers[id] = {}; + } + }; + + /** + * When an expression changes, store the information about it + * and increment a pointer. + * @param {string|Function} exp Expression + * @param {string} id Scope $id + * @param {Scope} locals AngularJS scope + * @param {boolean} pass Whether or not to pass on the first call + * @param {string} description AngularJS string to interpolate + * @return {Function} Watch function + * @private + */ + this._archive = function (exp, id, locals, pass, description) { + var _initStores = this._initStores; + return function (newVal, oldVal) { + var watchObj; + _initStores(id); + if (description) { + descriptions[id][exp] = $interpolate(description)(locals); + } + if (pass) { + pass = false; + return; + } + if (isUndefined(history[id][exp])) { + history[id][exp] = []; + } + if (isUndefined(pointers[id][exp])) { + pointers[id][exp] = 0; + } + history[id][exp].splice(pointers[id][exp] + 1); + history[id][exp].push(copy(newVal)); + pointers[id][exp] = history[id][exp].length - 1; + if (pointers[id][exp] > 0 && isDefined(watchObjs[id]) && + isDefined(watchObj = watchObjs[id][exp])) { + if (!batching) { + watchObj._fireChangeHandlers(exp, locals); + } + watchObj._broadcast('History.archived', { + expression: exp, + newValue: newVal, + oldValue: oldVal, + description: descriptions[id][exp], + locals: locals + }); + } + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#watch + * @method + * @methodOf decipher.history.service:History + * @description + * Register some expression(s) for watching. + * @param {string|string[]} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @returns {Watch|Array} {@link decipher.history.object:Watch Watch instance} or array of them + * + * @example + * + + + angular.module('decipher.history') + .run(function(History, $rootScope) { + $rootScope.foo = 'foo'; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + }); + + History.watch('foo', $rootScope, 'you changed the foo'); + }); + + + {{foo}}
    + {{message}}
    +     +     + */ + this.watch = function watch(exps, scope, description, lazyOptions) { + if (isUndefined(exps)) { + throw new Error('expression required'); + } + scope = scope || $rootScope; + description = description || ''; + var i, + id = scope.$id, + exp, + objs = [], + watchObj, + model; + + if (!isArray(exps)) { + exps = [exps]; + } + + this._initStores(id); + + i = exps.length; + while (i--) { + exp = exps[i]; + + // assert we have an assignable model + model = $parse(exp); + if (isUndefined(model.assign)) { + throw 'expression "' + exp + + '" is not an assignable expression'; + } + + // blast any old watches + if (isFunction(watches[id][exp])) { + watches[id][exp](); + } + + descriptions[id][exp] = $interpolate(description)(scope); + + this._watch(exp, scope, false, lazyOptions); + watchObjs[id][exp] = watchObj = new Watch(exp, scope); + objs.push(watchObj); + } + + return objs.length > 1 ? objs : objs[0]; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#deepWatch + * @method + * @methodOf decipher.history.service:History + * @description + * Allows you to watch an entire array/object full of objects, but only watch + * a certain property of each object. + * + * @example + * + + angular.module('decipher.history') + .run(function(History, $rootScope) { + var exp, locals; + + $rootScope.foos = [ + {id: 1, name: 'herp'}, + {id: 2, name: 'derp'} + ]; + + $rootScope.$on('History.archived', function(evt, data) { + $rootScope.message = data.description; + exp = data.expression; + locals = data.locals; + }) + + History.deepWatch('foo.name for foo in foos', $rootScope, + 'Changed {{foo.id}} to name "{{foo.name}}"') + .addChangeHandler('myChangeHandler', function($expression, + $locals, foo) { + console.log(foo); + console.log("(totally hit the server and update the model)"); + $rootScope.undo = function() { + History.undo($expression, $locals); + }; + $rootScope.canUndo = function() { + return History.canUndo($expression, $locals); + }; + }, {foo: 'foo'}); + }); + + + {{foos[0].name}}
    + {{message}}
    + +     +     + * @param {(string|string[])} exp Expression or array of expressions to watch + * @param {Scope=} scope Scope; defaults to `$rootScope` + * @param {string=} description Description of this change + * @param {Object=} lazyOptions Options for lazy loading. Only valid + * property is `timeout` at this point + * @return {Watch} {@link decipher.history.object:Watch Watch instance} + */ + this.deepWatch = + function deepWatch(exp, scope, description, lazyOptions) { + var match, + targetName, + valueFn, + keyName, + value, + valueName, + valuesName, + watchObj, + id = scope.$id, + _clear = bind(this, this._clear), + _initStores = this._initStores, + _archive = bind(this, this._archive), + createDeepWatch = function createDeepWatch(targetName, valueName, + keyName, watchObj) { + return function (values) { + forEach(values, function (v, k) { + + var locals = scope.$new(), + id = locals.$id; + locals.$$deepWatchId = scope.$$deepWatch[targetName]; + locals.$$deepWatchTargetName = targetName; + locals[valueName] = v; + if (keyName) { + locals[keyName] = k; + } + value = valueFn(scope, locals); + + _initStores(id); + + descriptions[id][exp] = $interpolate(description)(locals); + + if (isFunction(watches[id][targetName])) { + watches[id][targetName](); + } + + if (lazyBindFound && isObject(lazyOptions)) { + watches[id][targetName] = + locals.$watch(lazyWatch(locals, targetName, + lazyOptions.timeout || 500), + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = true; + } + else { + watches[id][targetName] = locals.$watch(targetName, + _archive(targetName, id, locals, false, description), + true); + lazyWatches[id][targetName] = false; + } + + watchObjs[id][targetName] = watchObj; + + locals.$on('$destroy', function () { + _clear(scope); + }); + + }); + + }; + }; + + description = description || ''; + if (!(match = exp.match(DEEPWATCH_EXP))) { + throw 'expected expression in form of "_select_ for (_key_,)? _value_ in _collection_" but got "' + + exp + '"'; + } + targetName = match[1]; + valueName = match[4] || match[2]; + valueFn = $parse(valueName); + keyName = match[3]; + valuesName = match[5]; + + if (isUndefined(scope.$$deepWatch)) { + scope.$$deepWatch = {}; + } + + // if we already have a deepWatch on this value, we + // need to kill all the child scopes. because reasons + if (isDefined(scope.$$deepWatch[targetName])) { + _clear(scope, targetName); + } + scope.$$deepWatch[targetName] = ++deepWatchId; + + _initStores(id); + watchObjs[id][targetName] = watchObj = new Watch(targetName, scope); + + // TODO: assert this doesn't leak memory like crazy. it might if + // we remove things from the values context. + watches[id][targetName] = scope.$watchCollection(valuesName, + createDeepWatch(targetName, valueName, keyName, + watchObj)); + + return watchObj; + }; + + /** + * Clears a bunch of information for a scope and optionally an array of expressions. + * Lacking an expression, this will eliminate an entire scopesworth of data. + * It will recognize deep watches and clear them out completely. + * @param {Scope} scope Scope obj + * @param {(string|string[])} exps Expression or array of expressions + * @private + */ + this._clear = function _clear(scope, exps) { + var id = scope.$id, + i, + nextSibling, + exp, + clear = function clear(id, key) { + var zap = function zap(what) { + if (isDefined(what[id][key])) { + delete what[id][key]; + if (Object.keys(what[id]).length === 0) { + delete what[id]; + } + } + }; + + if (isDefined(watches[id]) && + isFunction(watches[id][key])) { + watches[id][key](); + } + if (isDefined(watches[id])) { + zap(watches); + } + if (isDefined(watchObjs[id])) { + zap(watchObjs); + } + if (isDefined(history[id])) { + zap(history); + } + if (isDefined(pointers[id])) { + zap(pointers); + } + if (isDefined(lazyWatches[id])) { + zap(lazyWatches); + } + }, + + clearAll = function clearAll(id) { + forEach(watches[id], function (watch) { + return isFunction(watch) && watch(); + }); + delete watches[id]; + delete history[id]; + delete pointers[id]; + delete lazyWatches[id]; + delete watchObjs[id]; + }; + + if (isString(exps)) { + exps = [exps]; + } + else if (isUndefined(exps) && isDefined(watches[id])) { + exps = Object.keys(watches[id]); + } + + if (isDefined(exps)) { + i = exps.length; + while (i--) { + exp = exps[i]; + clear(id, exp); + } + } else { + clearAll(id); + } + nextSibling = scope.$$childHead; + while (nextSibling) { + this._clear(nextSibling, exp); + nextSibling = nextSibling.$$nextSibling; + } + }; + + + /** + * @ngdoc function + * @name decipher.history.service:History#forget + * @method + * @methodOf decipher.history.service:History + * @description + * Unregister some watched expression(s). + * @param {(string|string[])} exps Array of expressions or one expression as a string + * @param {Scope=} scope Scope object; defaults to $rootScope + */ + this.forget = function forget(scope, exps) { + scope = scope || $rootScope; + if (isDefined(exps) && isString(exps)) { + exps = [exps]; + } + this._clear(scope, exps); + }; + + /** + * Internal function to change some value in the stack to another. + * Kills the watch and then calls `_watch()` to restore it. + * @param {Scope} scope Scope object + * @param {string} exp AngularJS expression + * @param {array} stack History stack; see `History.history` + * @param {number} pointer Pointer + * @returns {{oldValue: {*}, newValue: {*}}} The old value and the new value + * @private + */ + this._do = function _do(scope, exp, stack, pointer) { + var model, + oldValue, + id = scope.$id; + if (isFunction(watches[id][exp])) { + watches[id][exp](); + delete watches[id][exp]; + } + model = $parse(exp); + oldValue = model(scope); + // todo: assert there's no bug here with unassignable expressions + model.assign(scope, copy(stack[pointer])); + this._watch(exp, scope, true); + return { + oldValue: oldValue, + newValue: model(scope) + }; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#undo + * @method + * @methodOf decipher.history.service:History + * @description + * Undos an expression to last known value. + * @param {string} exp Expression to undo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.undo = function undo(exp, scope) { + scope = scope || $rootScope; + if (isUndefined(exp)) { + throw new Error('expression required'); + } + var id = scope.$id, + scopeHistory = history[id], + stack, + values, + pointer, + watchObj; + + if (isUndefined(scopeHistory)) { + throw 'could not find history for scope ' + id; + } + + stack = scopeHistory[exp]; + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = --pointers[id][exp]; + if (pointer < 0) { + $log.warn('attempt to undo past history'); + pointers[id][exp]++; + return; + } + values = this._do(scope, exp, stack, pointer); + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireUndoHandlers(exp, scope); + watchObj._broadcast('History.undone', { + expression: exp, + newValue: values.newValue, + oldValue: values.oldValue, + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * Actually issues the appropriate scope.$watch + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {boolean=} pass Whether or not to skip the first watch execution. Defaults to false + * @param {Object} lazyOptions Options to send the lazy module + * @private + */ + this._watch = function _watch(exp, scope, pass, lazyOptions) { + var id; + scope = scope || $rootScope; + pass = pass || false; + id = scope.$id; + + // do we have an array or object? + if (lazyBindFound && (isObject(lazyOptions) || + (lazyWatches[id] && !!lazyWatches[id][exp]))) { + watches[id][exp] = + scope.$watch(lazyWatch(scope, exp, lazyOptions.timeout), + bind(this, this._archive(exp, id, scope, pass)), true); + lazyWatches[id][exp] = true; + } + else { + watches[id][exp] = + scope.$watch(exp, bind(this, this._archive(exp, id, scope, pass)), + true); + lazyWatches[id][exp] = false; + } + + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#redo + * @method + * @methodOf decipher.history.service:History + * @description + * Redoes (?) the last undo. + * @param {string} exp Expression to redo + * @param {Scope=} scope Scope; defaults to `$rootScope` + */ + this.redo = function redo(exp, scope) { + scope = scope || $rootScope; + var id = scope.$id, + stack = history[id][exp], + values, + pointer, + watchObj; + + if (isUndefined(stack)) { + throw 'could not find history in scope "' + id + + ' against expression "' + exp + '"'; + } + pointer = ++pointers[id][exp]; + if (pointer === stack.length) { + $log.warn('attempt to redo past history'); + pointers[id][exp]--; + return; + } + + values = this._do(scope, exp, stack, pointer); + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRedoHandlers(exp, scope); + watchObj._broadcast('History.redone', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canUndo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we have accumulated any history for a particular expression. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {boolean} Whether or not you can issue an `undo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canUndo = History.canUndo; + }); + + + Can undo? {{canUndo('foo')}} + + + */ + this.canUndo = function canUndo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] > 0; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#canRedo + * @method + * @methodOf decipher.history.service:History + * @description + * Whether or not we can redo an expression's value. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @return {Boolean} Whether or not you can issue a `redo()` + * @example + * + + angular.module('decipher.history').run(function(History, $rootScope) { + $rootScope.foo = 'bar'; + History.watch('foo'); + $rootScope.canRedo = History.canRedo; + $rootScope.canUndo = History.canUndo; + $rootScope.undo = History.undo; + }); + + +
    +
    + Can redo? {{canRedo('foo')}} +     +     + */ + this.canRedo = function canRedo(exp, scope) { + var id; + scope = scope || $rootScope; + id = scope.$id; + return isDefined(pointers[id]) && + isDefined(pointers[id][exp]) && + pointers[id][exp] < history[id][exp].length - 1; + }; + + /** + * @ngdoc function + * @method + * @methodOf decipher.history.service:History + * @name decipher.history.service:History#revert + * @description + * Reverts to earliest known value of some expression, or at a particular + * pointer if you please. + * @param {string} exp Expression + * @param {Scope=} scope Scope; defaults to $rootScope + * @param {number=} pointer Optional; defaults to 0 + */ + this.revert = function (exp, scope, pointer) { + scope = scope || $rootScope; + pointer = pointer || 0; + var id = scope.$id, + stack = history[id][exp], + values, + watchObj; + + if (isUndefined(stack)) { + $log.warn('nothing to revert'); + return; + } + values = this._do(scope, exp, stack, pointer); + + // wait; what is this? + history[id][exp].splice(); + pointers[id][exp] = pointer; + + if (isDefined(watchObjs[id]) && + isDefined(watchObjs[id][exp])) { + watchObj = watchObjs[id][exp]; + watchObj._fireRevertHandlers(exp, scope); + watchObj._broadcast('History.reverted', { + expression: exp, + oldValue: copy(values.newValue), + newValue: copy(values.oldValue), + description: descriptions[id][exp], + scope: scope, + pointer: pointer + }); + } + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#batch + * @method + * @methodOf decipher.history.service:History + * @description + * Executes a function within a batch context which can then be rolled back. + * @param {function} fn Function to execute + * @param {Scope=} scope Scope object; defaults to `$rootScope` + * @param {string=} description Description of this change + * @returns {Watch} {@link decipher.history.object:Watch Watch instance} + * @example + + + angular.module('decipher.history').run(function(History, $rootScope) { + var t; + + $rootScope.herp = 'derp'; + $rootScope.bar = 'baz'; + $rootScope.frick = 'frack'; + + $rootScope.$on('History.batchEnded', function(evt, data) { + t = data.transaction; + }); + + History.watch('herp'); + History.watch('bar'); + History.watch('frick'); + + $rootScope.batch = function() { + History.batch(function() { + $rootScope.herp = 'derp2'; + $rootScope.bar = 'baz2'; + $rootScope.frick = 'frack2'; + }) + .addRollbackHandler('myRollbackHandler', function() { + $rootScope.message = 'rolled a bunch of stuff back'; + }); + $rootScope.message = "batch complete"; + }; + + $rootScope.rollback = function() { + if (isDefined(t)) { + History.rollback(t); + } + }; + }); + + +
      +
    • herp: {{herp}}
      • +
    • bar: {{bar}}
      • +
    • frick: {{frick}}
      • +
    + +
    + {{message}} +     +     + */ + this.batch = function batch(fn, scope, description) { + var _clear = bind(this, this._clear), + _initStores = this._initStores, + listener, + watchObj, + child; + scope = scope || $rootScope; + if (!isFunction(fn)) { + throw new Error('transaction requires a function'); + } + + child = scope.$new(); + child.$on('$destroy', function () { + _clear(child); + }); + + listener = scope.$on('History.archived', function (evt, data) { + var deepChild, + exp = data.expression, + id; + if (data.locals.$id !== child.$id) { + deepChild = child.$new(); + deepChild.$on('$destroy', function () { + _clear(deepChild); + }); + deepChild.$$locals = data.locals; + id = deepChild.$id; + _initStores(id); + history[id][exp] = + copy(history[data.locals.$id][exp]); + pointers[id][exp] = pointers[data.locals.$id][exp] - 1; + } + }); + + watchObjs[child.$id] = watchObj = new Watch(null, child); + watchObj._broadcast('History.batchBegan', { + transaction: child, + description: description + }); + + // we need to put this into a timeout and apply manually + // since it's not clear when the watchers will get fired, + // and we must ensure that any existing watchers on the archived + // event can be skipped before the batchEnd occurs. + batching = true; + $timeout(function () { + fn(child); + scope.$apply(); + }) + .then(function () { + listener(); + batching = false; + watchObj._broadcast('History.batchEnded', { + transaction: child, + description: description + }); + }); + + + return watchObj; + }; + + /** + * @ngdoc function + * @name decipher.history.service:History#rollback + * @method + * @methodOf decipher.history.service:History + * @description + * Rolls a transaction back that was executed via {@link decipher.history.service:History#batch batch()}. + * + * For an example, see {@link decipher.history.service:History#batch batch()}. + * @param {Scope} t Scope object in which the transaction was executed. + */ + this.rollback = function rollback(t) { + + var _do = bind(this, this._do), + parent = t.$parent, + packets = {}, + nextSibling, + watchObj, + nextSiblingLocals; + if (!t || !isObject(t)) { + throw new Error('must pass a scope to rollback'); + } + + function _rollback(scope, comparisonScope) { + var id = scope.$id, + comparisonScopeId = comparisonScope.$id, + stack = history[id], + pointer, + descs, + exp, + values, + exps, + rolledback, + i; + if (stack) { + exps = Object.keys(stack); + i = exps.length; + } else { + // might not actually have history, it's ok + return; + } + while (i--) { + exp = exps[i]; + values = []; + descs = []; + pointer = pointers[comparisonScopeId][exp]; + rolledback = false; + while (pointer > pointers[id][exp]) { + pointer--; + values.push(_do(comparisonScope, + exp, history[comparisonScopeId][exp], pointer)); + pointers[comparisonScopeId][exp] = pointer; + descs.push(descriptions[comparisonScopeId][exp]); + // throw this off the history stack so + // we don't end up with it in the stack while we + // do normal undo() calls later against the same + // expression and scope + history[comparisonScopeId][exp].pop(); + rolledback = true; + } + if (rolledback) { + packets[exp] = { + values: values, + scope: scope, + comparisonScope: comparisonScope, + descriptions: descs + }; + } + } + } + + watchObj = watchObjs[t.$id]; + + if (isDefined(parent) && + isDefined(history[parent.$id])) { + _rollback(t, parent); + } + nextSibling = t.$$childHead; + while (nextSibling) { + nextSiblingLocals = nextSibling.$$locals; + if (nextSiblingLocals) { + _rollback(nextSibling, nextSiblingLocals); + } + nextSibling = nextSibling.$$nextSibling; + } + watchObj._fireRollbackHandlers(); + watchObj._broadcast('History.rolledback', packets); + + }; + + /** + * @ngdoc property + * @name decipher.history.service:History#history + * @propertyOf decipher.history.service:History + * @description + * The complete history stack, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.history = history; + + /** + * @ngdoc property + * @name decipher.history.service:History#descriptions + * @propertyOf decipher.history.service:History + * @description + * The complete map of change descriptions, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.descriptions = descriptions; + + /** + * @ngdoc property + * @name decipher.history.service:History#pointers + * @propertyOf decipher.history.service:History + * @description + * The complete pointer map, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.pointers = pointers; + + /** + * @ngdoc property + * @name decipher.history.service:History#watches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es, keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.watches = watches; + + /** + * @ngdoc property + * @name decipher.history.service:History#lazyWatches + * @propertyOf decipher.history.service:History + * @description + * The complete index of all AngularJS `$watch`es designated to be "lazy", keyed by Scope `$id` and then expression. + * @type {{}} + */ + this.lazyWatches = lazyWatches; + + /** + * @ngdoc property + * @name decipher.history.service:History#watchObjs + * @propertyOf decipher.history.service:History + * @description + * The complete index of all {@link decipher.history.object:Watch Watch} objects registered, keyed by Scope `$id` and then (optionally) expression. + * @type {{}} + */ + this.watchObjs = watchObjs; + + /** + * @ngdoc property + * @name decipher.history.service:History#Watch + * @propertyOf decipher.history.service:History + * @description + * Here's the Watch prototype for you to play with. + * @type {Watch} + */ + this.Watch = Watch; + }]); +})(); diff --git a/scripts/libs/angular-history/package.json b/scripts/libs/angular-history/package.json new file mode 100644 index 0000000000..acdcc7e58d --- /dev/null +++ b/scripts/libs/angular-history/package.json @@ -0,0 +1,51 @@ +{ + "_from": "github:decipherinc/angular-history#v0.8.0", + "_id": "angular-history@0.8.0", + "_inBundle": false, + "_integrity": "", + "_location": "/angular-history", + "_phantomChildren": {}, + "_requested": { + "type": "git", + "raw": "angular-history@github:decipherinc/angular-history#v0.8.0", + "name": "angular-history", + "escapedName": "angular-history", + "rawSpec": "github:decipherinc/angular-history#v0.8.0", + "saveSpec": "github:decipherinc/angular-history#v0.8.0", + "fetchSpec": null, + "gitCommittish": "v0.8.0" + }, + "_requiredBy": [ + "/superdesk-core" + ], + "_resolved": "github:decipherinc/angular-history#ee798413fba074e3d8f2d35fc951a83cb73e923e", + "_spec": "angular-history@github:decipherinc/angular-history#v0.8.0", + "_where": "/home/petr/dev/superdesk/client/node_modules/superdesk-core", + "bugs": { + "url": "https://github.com/decipherinc/angular-history/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "angular-history [![Build Status](https://travis-ci.org/decipherinc/angular-history.png?branch=master)](https://travis-ci.org/decipherinc/angular-history) ===============", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-bower-install-simple": "^1.1.3", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-connect": "^0.10.1", + "grunt-contrib-qunit": "^0.7.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-ngdocs": "^0.2.7" + }, + "homepage": "https://github.com/decipherinc/angular-history#readme", + "license": "MIT", + "name": "angular-history", + "repository": { + "type": "git", + "url": "git://github.com/decipherinc/angular-history.git" + }, + "scripts": { + "test": "grunt test" + }, + "version": "0.8.0" +} From 041b5f1a98988cb3f6a6a9164b81ffc0e265ce99 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Mar 2024 15:20:12 +0100 Subject: [PATCH 0995/1070] Fix extraction of translations for extensions (#4455) --- build-tools/package-lock.json | 2 +- build-tools/package.json | 2 +- build-tools/src/extensions/extract-translations.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/package-lock.json b/build-tools/package-lock.json index a07e83e623..be0b060044 100644 --- a/build-tools/package-lock.json +++ b/build-tools/package-lock.json @@ -1,6 +1,6 @@ { "name": "@superdesk/build-tools", - "version": "1.0.16", + "version": "1.0.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/build-tools/package.json b/build-tools/package.json index 1f36604f05..3f27436572 100644 --- a/build-tools/package.json +++ b/build-tools/package.json @@ -1,6 +1,6 @@ { "name": "@superdesk/build-tools", - "version": "1.0.16", + "version": "1.0.17", "publishConfig": { "access": "public" }, diff --git a/build-tools/src/extensions/extract-translations.js b/build-tools/src/extensions/extract-translations.js index bd6a9bf9c8..9e44d52094 100644 --- a/build-tools/src/extensions/extract-translations.js +++ b/build-tools/src/extensions/extract-translations.js @@ -12,7 +12,7 @@ function extractTranslations(clientDir) { const paths = _.get(package, 'superdeskExtension.translations-extract-paths'); if (paths == null || !Array.isArray(paths)) { - return null; + continue; } const pathsAbsolute = paths.map((p) => path.join(extensionRootPath, p)); From 8be019e9a55ed1cb77dc38d3031e88f25381acb4 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Mar 2024 10:12:14 +0100 Subject: [PATCH 0996/1070] update version of build tools (#4457) --- build-tools/package-lock.json | 2 +- build-tools/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/package-lock.json b/build-tools/package-lock.json index be0b060044..13a44e8bb3 100644 --- a/build-tools/package-lock.json +++ b/build-tools/package-lock.json @@ -1,6 +1,6 @@ { "name": "@superdesk/build-tools", - "version": "1.0.17", + "version": "1.0.19", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/build-tools/package.json b/build-tools/package.json index 3f27436572..8e2319fded 100644 --- a/build-tools/package.json +++ b/build-tools/package.json @@ -1,6 +1,6 @@ { "name": "@superdesk/build-tools", - "version": "1.0.17", + "version": "1.0.19", "publishConfig": { "access": "public" }, From d1aca39a5d2d8d2be0630b8240ec351b5dd449fb Mon Sep 17 00:00:00 2001 From: Nikola Stojanovic <68916411+dzonidoo@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:59:00 +0100 Subject: [PATCH 0997/1070] Playwright tests (#4426) --- e2e/client/package.json | 2 +- e2e/client/playwright/authoring.spec.ts | 48 +++++++++++- e2e/client/playwright/dashboard.spec.ts | 24 ++++++ .../monitoring.custom-workspace.spec.ts | 52 ++++++++++++ .../playwright/monitoring.duplication.spec.ts | 8 +- .../monitoring.personal-space.spec.ts | 74 ++++++++++++++++++ .../playwright/monitoring.spiking.spec.ts | 39 +++++++++ .../page-object-models/monitoring.ts | 24 +++++- e2e/client/playwright/user-profile.spec.ts | 3 +- .../contentapi_e2e/_sd_dump_metadata.json.bz2 | Bin 100 -> 100 bytes .../superdesk_e2e/_sd_dump_metadata.json.bz2 | Bin 104 -> 103 bytes .../full/main/superdesk_e2e/activity.json.bz2 | Bin 1043 -> 1887 bytes .../full/main/superdesk_e2e/archive.json.bz2 | Bin 1051 -> 1626 bytes .../superdesk_e2e/archive_history.json.bz2 | Bin 1616 -> 2910 bytes .../superdesk_e2e/archive_versions.json.bz2 | Bin 1425 -> 2479 bytes .../full/main/superdesk_e2e/audit.json.bz2 | Bin 5927 -> 10354 bytes .../full/main/superdesk_e2e/auth.json.bz2 | Bin 503 -> 503 bytes .../superdesk_e2e/content_templates.json.bz2 | Bin 601 -> 599 bytes .../main/superdesk_e2e/content_types.json.bz2 | Bin 914 -> 921 bytes .../main/superdesk_e2e/sequences.json.bz2 | Bin 125 -> 125 bytes .../full/main/superdesk_e2e/users.json.bz2 | Bin 1203 -> 1187 bytes .../main/superdesk_e2e/workspaces.json.bz2 | Bin 0 -> 200 bytes .../_sd_dump_metadata.json.bz2 | Bin 111 -> 108 bytes .../_sd_dump_metadata.json.bz2 | Bin 117 -> 116 bytes package.json | 4 +- scripts/apps/archive/show-spike-dialog.tsx | 2 +- scripts/apps/dashboard/grid/views/grid.html | 4 +- scripts/apps/dashboard/views/workspace.html | 8 +- .../search/components/actions-menu/Item.tsx | 8 ++ .../actions-menu/SubmenuDropdown.tsx | 4 + .../workspace/views/edit-workspace-modal.html | 2 +- .../workspace/views/workspace-dropdown.html | 3 +- scripts/core/services/modalService.tsx | 4 +- scripts/core/ui/components/options-modal.tsx | 3 +- .../components/prompt-for-unsaved-changes.tsx | 2 + 35 files changed, 291 insertions(+), 27 deletions(-) create mode 100644 e2e/client/playwright/dashboard.spec.ts create mode 100644 e2e/client/playwright/monitoring.custom-workspace.spec.ts create mode 100644 e2e/client/playwright/monitoring.personal-space.spec.ts create mode 100644 e2e/client/playwright/monitoring.spiking.spec.ts create mode 100644 e2e/server/dump/full/main/superdesk_e2e/workspaces.json.bz2 diff --git a/e2e/client/package.json b/e2e/client/package.json index ce48af9362..568da9f02e 100644 --- a/e2e/client/package.json +++ b/e2e/client/package.json @@ -21,7 +21,7 @@ "server": "grunt server", "start-client-server": "http-server dist -p 9000 -s &", "stop-client-server": "fuser -k 9000/tcp", - "playwright": "playwright test", + "playwright": "playwright test --workers 1", "playwright-interactive": "playwright test --ui", "protractor": "protractor protractor.conf.js", "specs--compile": "find ./specs/ -name '*.js' -type f -delete && tsc -p ./specs", diff --git a/e2e/client/playwright/authoring.spec.ts b/e2e/client/playwright/authoring.spec.ts index fb76580114..e0023453ed 100644 --- a/e2e/client/playwright/authoring.spec.ts +++ b/e2e/client/playwright/authoring.spec.ts @@ -2,14 +2,14 @@ import {test, expect} from '@playwright/test'; import {Monitoring} from './page-object-models/monitoring'; import {restoreDatabaseSnapshot, s} from './utils'; -test('can apply "populate abstract" macro', async ({page}) => { +test('applying "populate abstract" macro', async ({page}) => { await restoreDatabaseSnapshot(); const monitoring = new Monitoring(page); await page.goto('/#/workspace/monitoring'); - await monitoring.selectDesk('Sports'); + await monitoring.selectDeskOrWorkspace('Sports'); await page.locator( s('monitoring-group=Sports / Working Stage', 'article-item=test sports story'), @@ -38,3 +38,47 @@ test('can apply "populate abstract" macro', async ({page}) => { page.locator(s('authoring', 'authoring-field=abstract')).getByRole('textbox'), ).toHaveText('test sport story body'); }); + +test('cancel and ignore buttons from unsaved changes modal', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await monitoring.selectDeskOrWorkspace('Sports'); + + // create article without saving + await monitoring.createArticleFromTemplate('story', {slugline: 'new article'}); + + // check unsaved changes modal is visible + await page.locator(s('authoring-topbar', 'close')).click(); + await expect(page.locator(s('unsaved-changes-dialog')).getByRole('dialog')).toBeVisible(); + + // button - cancel + await page.locator(s('unsaved-changes-dialog')).getByRole('button', {name: 'cancel'}).click(); + await expect(page.locator(s('authoring'))).toBeVisible(); + + // button - ignore + await page.locator(s('authoring-topbar', 'close')).click(); + await page.locator(s('unsaved-changes-dialog')).getByRole('button', {name: 'ignore'}).click(); + await expect(page.locator(s('authoring'))).not.toBeVisible(); + await expect(page.locator(s('monitoring-view', 'article-item=new article'))).not.toBeVisible(); +}); + +test('save button from unsaved changes modal', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await monitoring.selectDeskOrWorkspace('Sports'); + + // create article without saving + await monitoring.createArticleFromTemplate('story', {slugline: 'new article'}); + + // button - save + await page.locator(s('authoring-topbar', 'close')).click(); + await page.locator(s('unsaved-changes-dialog')).getByRole('button', {name: 'save'}).click(); + await expect(page.locator(s('authoring'))).not.toBeVisible(); + await expect(page.locator(s('monitoring-view', 'article-item=new article'))).toBeVisible(); +}); diff --git a/e2e/client/playwright/dashboard.spec.ts b/e2e/client/playwright/dashboard.spec.ts new file mode 100644 index 0000000000..d5558201fe --- /dev/null +++ b/e2e/client/playwright/dashboard.spec.ts @@ -0,0 +1,24 @@ +import {test, expect} from '@playwright/test'; +import {Monitoring} from './page-object-models/monitoring'; +import {restoreDatabaseSnapshot, s} from './utils'; + +test('adding a widget to a dashboard', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace'); + + await monitoring.selectDeskOrWorkspace('Sports'); + + await expect( + page.locator(s('widget-grid', 'widget=world-clock')), + ).not.toBeVisible(); + + await page.getByRole('button', {name: 'Add widget'}).click(); + await page.locator(s('widget-modal', 'widget-item=world-clock')).click(); + await page.locator(s('widget-modal')).getByRole('button', {name: 'Add This Widget'}).click(); + await page.locator(s('widget-modal')).getByRole('button', {name: 'Done'}).click(); + await expect( + page.locator(s('widget-grid', 'widget=world-clock')), + ).toBeVisible(); +}); \ No newline at end of file diff --git a/e2e/client/playwright/monitoring.custom-workspace.spec.ts b/e2e/client/playwright/monitoring.custom-workspace.spec.ts new file mode 100644 index 0000000000..29aa02c66b --- /dev/null +++ b/e2e/client/playwright/monitoring.custom-workspace.spec.ts @@ -0,0 +1,52 @@ +import {test, expect} from '@playwright/test'; +import {Monitoring} from './page-object-models/monitoring'; +import {restoreDatabaseSnapshot, s} from './utils'; + +test('creating a custom workspace', async ({page}) => { + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await page.locator(s('monitoring--selected-desk')).click(); + await page + .locator(s('monitoring--select-desk-options')) + .getByRole('button', {name: 'create new workspace'}) + .click(); + await expect(page.locator(s('workspace-modal')).locator('button', {hasText: 'save'})).toBeDisabled(); + await page.locator(s('workspace-modal')).getByLabel('workspace name').fill('new custom workspace'); + await expect(page.locator(s('workspace-modal')).locator('button', {hasText: 'save'})).toBeEnabled(); + await page.locator(s('workspace-modal')).locator('button', {hasText: 'save'}).click(); + await expect(page.locator(s('monitoring--selected-desk'), {hasText: 'new custom workspace'})).toBeVisible(); +}); + +test('cancelling creation of a custom workspace', async ({page}) => { + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await page.locator(s('monitoring--selected-desk')).click(); + await page + .locator(s('monitoring--select-desk-options')) + .getByRole('button', {name: 'create new workspace'}) + .click(); + await page.locator(s('workspace-modal')).getByLabel('workspace name').fill('new custom workspace'); + await expect(page.locator(s('workspace-modal')).locator('button', {hasText: 'cancel'})).toBeEnabled(); + await page.locator(s('workspace-modal')).locator('button', {hasText: 'cancel'}).click(); + await expect( + page.locator(s('monitoring--selected-desk'), {hasText: 'new custom workspace'}), + ).not.toBeVisible(); +}); + +test('creating an article from a custom workspace', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await monitoring.selectDeskOrWorkspace('Workspace 1'); + + // create new article and save it + await monitoring.createArticleFromTemplate('story', {slugline: 'new article 2'}); + await page.locator(s('authoring-topbar', 'save')).click(); + + // check if article exist in monitoring group + await expect(page.locator(s('monitoring-view', 'article-item=new article 2'))).toBeVisible(); +}); diff --git a/e2e/client/playwright/monitoring.duplication.spec.ts b/e2e/client/playwright/monitoring.duplication.spec.ts index e4bc17c1de..eb61e8e703 100644 --- a/e2e/client/playwright/monitoring.duplication.spec.ts +++ b/e2e/client/playwright/monitoring.duplication.spec.ts @@ -2,7 +2,7 @@ import {test, expect} from '@playwright/test'; import {Monitoring} from './page-object-models/monitoring'; import {restoreDatabaseSnapshot, s} from './utils'; -test('duplicate in place', async ({page}) => { +test('duplicate in place action', async ({page}) => { const monitoring = new Monitoring(page); const articleSelector = s('monitoring-group=Sports / Working Stage', 'article-item=test sports story'); @@ -24,16 +24,16 @@ test('duplicate in place', async ({page}) => { await expect(page.locator(s('article-item'))).toHaveCount(initialItemsCountAcrossAllStages + 1); }); -test('duplicate to personal space', async ({page}) => { +test('duplicate to personal space action', async ({page}) => { const monitoring = new Monitoring(page); const articleSelector = s('monitoring-group=Sports / Working Stage', 'article-item=test sports story'); await restoreDatabaseSnapshot(); await page.goto('/#/workspace/personal'); - await expect(page.locator(s('list-item-placeholder'))).not.toBeVisible(); - await expect(page.locator(articleSelector)).toHaveCount(0); + await expect(page.locator(s('list-item-placeholder'))).toBeVisible(); + await expect(page.locator(s('list-item-placeholder'))).not.toBeVisible(); const itemCountInPersonalSpace = await page.locator(s('article-item')).count(); diff --git a/e2e/client/playwright/monitoring.personal-space.spec.ts b/e2e/client/playwright/monitoring.personal-space.spec.ts new file mode 100644 index 0000000000..187f37d057 --- /dev/null +++ b/e2e/client/playwright/monitoring.personal-space.spec.ts @@ -0,0 +1,74 @@ +import {test, expect} from '@playwright/test'; +import {Monitoring} from './page-object-models/monitoring'; +import {restoreDatabaseSnapshot, s} from './utils'; + +test('creating an article in personal space', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/personal'); + + await monitoring.createArticleFromTemplate('story', {slugline: 'article 1'}); + await page.locator(s('authoring-topbar', 'save')).click(); + await expect(page.locator(s('monitoring-group=Personal Items', 'article-item=article 1'))).toBeVisible(); +}); + +test('editing an article in personal space', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/personal'); + + await monitoring.executeActionOnMonitoringItem( + page.locator(s('article-item=personal space article 1')), + 'Edit', + ); + await page.locator(s('authoring', 'field-slugline')).fill('personal space article 1.1'); + await page.locator(s('authoring-topbar', 'save')).click(); + await expect( + page.locator(s('monitoring-group=Personal Items', 'article-item=personal space article 1')), + ).not.toBeVisible(); + await expect( + page.locator(s('monitoring-group=Personal Items', 'article-item=personal space article 1.1')), + ).toBeVisible(); +}); + +test('copying an article in personal space', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/personal'); + + await expect(page.locator(s('article-item=personal space article 1'))).toHaveCount(1); + + await monitoring.executeActionOnMonitoringItem( + page.locator(s('article-item=personal space article 1')), + 'Copy', + ); + + await expect(page.locator(s('article-item=personal space article 1'))).toHaveCount(2); +}); + +test('sending an item from personal space', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/personal'); + + // send article to desk + await monitoring.executeActionOnMonitoringItem( + page.locator(s('article-item=personal space article 1')), + 'Send to', + ); + await page.locator(s('interactive-actions-panel')).locator(s('item'), {hasText: 'Working Stage'}).check(); + await page.locator(s('interactive-actions-panel', 'send')).click(); + + // check if article removed from personal space + await expect( + page.locator(s('monitoring-group=Personal Items', 'article-item=personal space article 1')), + ).not.toBeVisible(); + + // go to monitoring and check visibility of article + await page.goto('/#/workspace/monitoring'); + await expect(page.locator(s('monitoring-view', 'monitoring-group=Sports / Working Stage'))).toBeVisible(); +}); diff --git a/e2e/client/playwright/monitoring.spiking.spec.ts b/e2e/client/playwright/monitoring.spiking.spec.ts new file mode 100644 index 0000000000..9438676bbf --- /dev/null +++ b/e2e/client/playwright/monitoring.spiking.spec.ts @@ -0,0 +1,39 @@ +import {test, expect} from '@playwright/test'; +import {Monitoring} from './page-object-models/monitoring'; +import {restoreDatabaseSnapshot, s} from './utils'; + +test('spiking and unspiking an article', async ({page}) => { + const monitoring = new Monitoring(page); + + await restoreDatabaseSnapshot(); + await page.goto('/#/workspace/monitoring'); + + await monitoring.selectDeskOrWorkspace('Sports'); + + // spike article + await monitoring.executeActionOnMonitoringItem( + page.locator(s('article-item=story 2')), + 'Spike Item', + ); + await page.locator(s('spike-modal')).getByRole('button', {name: 'spike'}).click(); + + // check is article removed form monitoring + await expect(page.locator(s('monitoring-view', 'article-item=story 2'))).not.toBeVisible(); + + // go to spike item list and check visibility of article + await page.locator(s('Spiked Items')).click(); + await expect(page.locator(s('articles-list', 'article-item=story 2'))).toBeVisible(); + + // unspike article + await monitoring.executeActionOnMonitoringItem( + page.locator(s('article-item=story 2')), + 'Unspike Item', + ); + await expect(page.locator(s('interactive-actions-panel'))).toBeVisible(); + await page.locator(s('interactive-actions-panel')).locator(s('item'), {hasText: 'Working Stage'}).check(); + await page.locator(s('interactive-actions-panel', 'unspike')).click(); + + // go to monitoring and check visibility of article + await page.goto('/#/workspace/monitoring'); + await expect(page.locator(s('monitoring-view', 'article-item=story 2'))).toBeVisible(); +}); \ No newline at end of file diff --git a/e2e/client/playwright/page-object-models/monitoring.ts b/e2e/client/playwright/page-object-models/monitoring.ts index ebb0b105a8..9ee47f36a1 100644 --- a/e2e/client/playwright/page-object-models/monitoring.ts +++ b/e2e/client/playwright/page-object-models/monitoring.ts @@ -8,14 +8,14 @@ export class Monitoring { this.page = page; } - async selectDesk(deskName: string): Promise { + async selectDeskOrWorkspace(deskName: string): Promise { const deskSelectDropdown = this.page.locator(s('monitoring--selected-desk')); const selectedDeskText = await deskSelectDropdown.textContent(); if (selectedDeskText.toLocaleLowerCase().includes(deskName.toLocaleLowerCase()) !== true) { await deskSelectDropdown.click(); - await this.page.locator(s('monitoring--select-desk-options', 'item'), {hasText: deskName}).click(); + await this.page.locator(`${s('monitoring--select-desk-options')} button`, {hasText: deskName}).click(); } } @@ -29,9 +29,25 @@ export class Monitoring { const actionsWithoutLast = actionPath.slice(0, actionPath.length - 1); for (const action of actionsWithoutLast) { - await this.page.locator(s('context-menu')).getByRole('button', {name: action}).hover(); + await this.page.locator(s('context-menu')).getByRole('button', {name: action, exact: true}).hover(); } - await this.page.locator(s('context-menu')).getByRole('button', {name: actionPath[actionPath.length - 1]}).click(); + await this.page.locator(s('context-menu')) + .getByRole('button', {name: actionPath[actionPath.length - 1], exact: true}) + .click(); + } + + async createArticleFromTemplate(template: string, options?: {slugline?: string}): Promise { + await this.page.locator(s('content-create')).click(); + await this.page.locator(s('content-create-dropdown')).getByRole('button', {name: 'More Templates...'}).click(); + await this.page.locator(s('content-create-dropdown')).getByRole('button', {name: template}).click(); + + if (options != null) { + let keys = Object.keys(options); + + for (const key of keys) { + await this.page.locator(s('authoring', `field-${key}`)).fill(options[key]); + } + } } } diff --git a/e2e/client/playwright/user-profile.spec.ts b/e2e/client/playwright/user-profile.spec.ts index 2a2206eaba..f691f39535 100644 --- a/e2e/client/playwright/user-profile.spec.ts +++ b/e2e/client/playwright/user-profile.spec.ts @@ -14,5 +14,6 @@ test('switching system language', async ({page}) => { await page.locator(s('action-bar')).locator('[data-test-id="save"]').click(); await page.getByRole('dialog').getByRole('button', {name: 'Confirm'}).click(); - await expect(page.locator(s('page-title'))).toHaveText('Mein Profil', {timeout: 10000}); // timeout needed due to page reload + // timeout needed due to page reload + await expect(page.locator(s('page-title'))).toHaveText('Mein Profil', {timeout: 10000}); }); diff --git a/e2e/server/dump/full/main/contentapi_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/main/contentapi_e2e/_sd_dump_metadata.json.bz2 index db3c1e678fb07c2991f3e8e7b02586308f1411eb..4624aba1ac62f0425202f95f02606c15490bb78c 100644 GIT binary patch literal 100 zcmV-q0Gt0pT4*^jL0KkKS)6+eP5=NT8-P#+d+-1Nz9HNSAOJwsJf;9gsp=XJP*4Cg z00D8BBj1(b%tBTq2(MJMHH`M0O;lSfFihJ+6~qKRHfa?ZjLp^Z@;ZF~#oUoj6eK4e G!xMm}KP6oN literal 100 zcmV-q0Gt0pT4*^jL0KkKS>GX=!T3hrzSg3~zDE4V4WND}A?@jJ+7?nF?hwvkT}{9VZu;X*@v GhHD5k1}Fsp diff --git a/e2e/server/dump/full/main/superdesk_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/_sd_dump_metadata.json.bz2 index b6e23d76fb008d10a74d094a0c5e6cd9f2b7ccab..a21122d7e2b691217d4f7dac7b9bde219f2244b9 100644 GIT binary patch literal 103 zcmV-t0GR(mT4*^jL0KkKS;JzncK`q*n}ARSd+-1NzA4@cAOJ{+N2%zKQ1w4l8V^t+ zG$R5G0BSL?qEgp^x2FlLSeO`PyELYhNdQXZXc8QyOJrw JgoYaxi@1#tCzyIIrUcl z-J4(la7jQ&(W60=CXE0903?tA2%3~VBR~KE3;+!pXagpI&}0UH%~4bIDZNb^Pfaw^ zG8zmc38oP#G&Gv0>7_lWAoPGeLr)X{Qj~^(ngB+VDdf^=qfI=glZYT*D8)tyLL&$W z5Q-8AL5e{bq!1v1J;N0b;K5F#{$D%GgSEla>=@z=g26!SJmNtwTJ$qq*W|TW8TeW+ zu;8NmP5UcxleE_}HMnp}As3kOUBHR$Idb%+i4SEwM?22v$f1*Cp*+bFB6wK?f@Ipv zFaX0+ttrd8W-~J} zim@Uo2!SAk9`U#y6Xn-#H%fJ_aF3P{s{%$D+<@ON3Q1;`|0}pINkbsY(h@tCA)v}k zs?aeFD8ynqbmgN>v;1M0rsO(PZ8e(BlZ5E&GBtE=c-F*h@MO9wl>4eXB9)JDc!!`N zn8NTOsJE}psVPayGIQlgOrxOF=jI|{z!6|UA{+dYB0&Kktqu-ft2b{$<|0=;Vj=C6 zhsa{xbWBLF;}astfa3-`dvip9B$sHFAt_RvGz~FL^_pLg37;J_1UYjeZ><=XdqB{$%dIF7*M z>EDN9&am<66Eut)I{WE3TGY4{HQ8HC&~_yyPR%F zgjf_QdYW`NOT?(DjMJbcZ&46G)dg{zCF9$TW7#YtYKIB}azMlEI1c-3W5jzRWI8-D z6UIkDAnDoSMC)O~ zBw!~<2vh-36$!_28wZ7XcL3cu)Qk_k;~gM$)i|x-$x`He;Mf6 z#8+)Aat*<(@)3nJmZgFD=CO&X-LGS5B?bn`o=uVmI`kf~_JsW{@?k z$BbVa66ZLQLSF0u1dJq(A;Iwg%Gomp!uqbGGftWmF(Mbi;e_J|$~DRnoYHbtMyBa`p7k6$(nu-dQTP7E zV${eS66h-sv|y0x<-zc-$BI5^_Hqu*C~^+P{<`pfNpSZBifb4azWpoN55n;TGvzD8WNZuSt$DTLkRVUv>TR zAbNrkQp(pY`nc^+M}-?VI8D0lJhWHw+10tF8At8n%rN=)28UyFFOok2^snUl!;oas zvrU^Y7eF2f!hAsl?JcFHR$_}%nmQc&C(T_BBE+SCwJ)CE9aY~%Ufj)hCti^G=il5P z2MH`y2drJg;z!`GhpOIW%#qK#l-tMG$G=Yv+(PN{H+<3ZlT#?_kBdgY-j9knr_mH@ z5S#%f5`8wc6h6Xgvr@=1K;M0u^djpp(QQTsi<)O)er5(!V01?WZ<KGPc258R literal 1043 zcmV+u1nm1lT4*^jL0KkKS#*VETmS>@8-QE~|L{x>zyIIrPz3z+M&Jy4v)Z#Fgp#M| zsrskto>S4{iL{=lsCt0V00}9gJph_1JwreM02&6KsZ9nTWWpL~20?@XiAkeKo}}`g zN&13h{X!n2O`#r8MG|P6QIkq+X$hu*k)esEo0M-vfRSVw1W2R^j0Pa_Ii8;0yfD2v zPjLLTIBOk4%r9b2MGuPrp5+Um%%zJIEK3K0z_J06UUSrJ>o_-q!r|Lisa;?+IJ=Y~ zvh9#$OQJ{^upOxla9OEwyo%UnDF@MYtF>T)Ngy&HLJW%!nR0Q^<1J4ffXk-g^2hJg zYV*xN{T&n~8At{|g@vuu^@J`4$yDB(63MYS<=~p;CiJ6@-x^XGr1*(=LWO|tNDQ$` z)JO}CR3#w5&eTomcjC9Dw9ejkYlOT>-_*$VMqE*3R*s6L8;WxYY^9Q`tIHaFA_KncHM{1`Kx+ifGdC=9_Ib9hp~MA&$AiwM{TM76Mjh`kx$ zfQzGmX>|AKsuuRmjJ;bgNpy=M+ujWUsy8Vx_9M zk${r~QB!G}d+2i*runTl#pQ=0_(SC>B{8EQ;Ct%=lwgI@F|H|!&xn;kK1aS_1Tg%( zXMJdzP9mLfAni;Oxg{!{soI+1ib(uo#2?9oii_O~1NBK=%f&hLoufIE)I{sYmD<*6 z6RLI;DhI&lmqpU*ZpPp=UiG;!)f%Uc%nl6B5Hd(Y00bZaq6nEfh!R=x%7$k}KqP{o zJ#F}c1Y-;-Y%tj=Jn!8rrNs}yC^9l!lhI@Y)kAEHAaUirF_@cZneu1{B&THz*V#P9 zgfIe`<&N|!O!U2fI&LaR5C?}sdE}kz$uvEDheU-MT;i2VwZLDleS7X~+8jDY?0988 zE2tD1FVr07Ofw|4??d6QM&wEFrinBzG| zG`6@CoOZ-B64SX9fr>IkR5=0Ox`E$R)Noyi^b^x>%{n21n=F;~(KjZCl6hTddS}ZAF_p#p;M)#6Lv!cvXwwRxs4K#xrK-)qLQ9sz!|`W8%;*g#uTcBpo4HR{$Hs=*R#7 diff --git a/e2e/server/dump/full/main/superdesk_e2e/archive.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/archive.json.bz2 index 7ac3b4988467c0f2dd4e7b1606b043d51eab6b66..227512193dcbea1f37b0fb3f17d91865cc647557 100644 GIT binary patch literal 1626 zcmV-g2BrBzT4*^jL0KkKS?E`D1pozeUw{w*Txb9FCgxrWzyJUGUAH@OrNQedVtB0)5-!UMAXTlDf*{{Jf5HeFqs(| z8hS=F$D9=A1`v@55kQ0#BtelRj2N&&3}7)y4b2!t3H+h~N*{LMdWea`@U?Dm5fsGt z3SQUaJZD7F>C;;^e)e>o9REigPw{)ZZE9QAy{qoq3@|gXNt58o&tMuiOdpZ)H!*nE zLB+7%#@3WW16mRecH}p<{+k7^447!SE9GC~{H}Rv`ZIFn zTnrv9nm@$2=;0?S*nnxeQ-WF6RHca!1M?gKzdZjJDwE~G-fG@nI7kZI*pr^D!JB85 zo;$1$%S!pkZVP^ICn*mWh5&Ue>?b{(_2dql#O`Y>F&khLrxsk^lC=9vpyKyGAa*%B z-0W)H*BN(c$YloxyUMo>oVV`E#|cQ`SA8^XT;eKqhm2tkX@gB=D!er2-rJ0{Oi+ed zx;Ha~E3EjPAQ@yQ2F?1nH{#OfO&uud13=w@#kk{}qjj7VA>`FDcHfE1uDN8=hZdni%rx1&x)ko+wXpD!F4^GKobilVH{RmIe);Ss=CW=QOx=_( zaoa>EV$Nt=Dyrc*X*g)Pp(1Jq;o=;1w+7p<8%;~t*LI5G zj@C6poIOmsNjxvj%u%C-y@l>3&6+fCXw|vtXrBW<)+4iCp!egB+&gn*Yh*dyZg=A6 zVIbh-;{5&oT?3f^#tnHre+C_a#2G9<uRlZ1$k9Ga9E zevfn2>Dk#10!^o#Exx%So&_^*K9+L1yxnpu~voeHzu1Ce1!99cvClFlxiet5zo1pJUAq{d!~F-1q1{ z(}r1iTW1FWlUFw1sj3Ga82xrQFc01j+1~iNMV}+pto^P?O7B5Dqe=v~BqH+&lq!1O`~h?y{*S-r#U zPe-E-o#%~R!*k%liuMNFf=yQ8DK^0nL_LRLt1P^n4%0_KDW{;90|N*_bI5nTWZDmB zoSoS)o>B(D-pP@sBrsrs2uZ!-?qu^W4lFx9?#w$p0kg5+5wp1y?gmdFZ0-kEjqYJ! zba8hrSwpy|oHIh~F!cyw2zWaQhhvyilVFwu>fnXrHXKGwHD+AkT+p#*WDpNjOW!Po zb`1viB>RND6G(saRz|MF)E{!2GE>$C$B;bz3*8<#=laPq`0p3Mj_d7e^H^j2xqIcqUhsh)doABx)CDZV0Eq%G*fK}{Bw~nRk28`9Ig@ySTfi&lSi?7gNaoY!+y}` z+Rsf^lB89uHFVZlCqZQF?5Gx0$w@MEClG!LA{&A-&cTQ|lnFsHSuEKnsu)czR7z6? zTILc`S4)POtO=(y+NJ{=jSS>Uvd&v!u}MfVc~xBniq*{&ps7hp;N}F8cu{o(6`{Ft z;J8yUu3d*{b{|44eMp`I-_$_sI-@eh20SDPdPkhCo1O8DAvZznv|kLlh_%nFN}~2y1;bvhx=Y97PbQk^34zJBg{yWHYNzZb zY)Q-vM^b&+?LcjcniN3%4}`0=O!cw6Paw!&>$um4XnuFsTaNM)N=I?fU7QMC3oImo zhb5_Cv{1KO3{3w3>Ky&x#FEc7X<@qg1R%p3xnl=A4v53JSv(@e;}(3M%T>DdB1CpL zb(BQw-7^5{58XDX=epVSWK#z04W`3vLP2b!G-G|1Nmw%^-ocuSurkuW#}FbNY1+p7{mUi{Qx)_&s!7H#6#n)4@t2|#l% z)=Gf(xZ$Gtl*Nj*%|8UO$Q&>9}6skIFN2%=1gVhoceiRhr7m`z52 z4A4UYB?tlxf);?$Quf1Jko&>}t&tgA8df4(#JONrj!o^& z%@;L`Q{LY2tqBPvkjN-#3Ic|Pf`dxRk*6fg&=rhG0l+Lv85L?la&BWsRyd4m{{gT% z0G+^uSyB-ps6rru0A^HRkw{o(R3;V)W*A@;g<%w7fkVpP|2f@Hhg*3~EAyJ)b*{U= z$t;jo@~<+ivCODa?Pi$Lm{s?4(&H;+Z}m7-*!xjei_PR@;z=YB$pl`0$hR=5c^@#4 zfFXFsRAg+{L9j}su)T$amkYv#88ZSwMwW2Q=*48gkp(d`222=vyV|rWYjZHEDo9Kq zr9?CkxC_9j9J@faH3BKdFRvBLUTRPd8m=8BO&2pYF#^kSnxXd@HYL1zp>iv>x&}g2 zJW=i`3D3I&(It1+DD_KqH$Nys@!Z16E+l6e!5F=&Ah(-^`hqWMV=Xsu4_X?NJtNO4 z4xOX-@%K34*&`wgC152Z;DoM+d5G}x27u|wU(PwgQ&8V@t@|&cM-u#iwAlbPxlL7405lRMRO1#8waGV;MMVa zUc+DsOh6U_PIjL|z<6gI(}sKB=N1j_2`0do9+vS4I&8@# zTG+I3oN2)^(^M@@*MUzUq4zQ|2*5F2E~*N0z5HZ5B$6|H%_s33HP>Q0%3X3rYh39h zjJ~s^H4^UEnbsPmpGY(%!g@*wCX6KDNO44REgp5Fm`QNfB!#vas-aM3brAbDggeDNv)W+&qb%>J~_?Gs-(#N%oKvQg4s%5=0iI<2eUt3W)tW|N*XL);X0^={aytp6kxDp3*anMk9h4zhq>$r9 zkkf@+lO$#vhElZKv!YO!iO$JNsZOr9LQ~t3Jfx|NAVNW45pfwy_90@G0{}2s2L(C- z>VgpTh~e|-bO^5-#2Y~ShS1G}=oyEQIUYA~W*=bO>2(J1j-f#C3k8p;Dir7=xHDZs z!|6xtfcwMN5MV|pxIJS0$%3aKd>=zqOCi)AclK23e>F?QV;Zj(&79m=VCXGcxHk>L z;IvecXw~{emFGUT;k&&>(Mg>{|Ml~T7RaFsH5mi-H zRaJyIKn@K{m4Tl>MLR6_vK^{G8TY0Z`@7Z`s;ODfE6s9F?cG|%bXse=LkeXi@w;uj zZZ^!}mfgywu9=v(qLY3Kr-R6Dxm4k%l;d|S_+VQ-ckw*F`Ci1RB6! zzFu1;xK0-2u=h?VB2lQ+gk=t;cOI&)ws!O9LSN-S9>D7qV;r`ML{DQI4|-sQr%yfx z`2vVIAq{}|2XoMa-cV5Ta2CFHqkw?HQVNjkr;msnl${R_cIlT+krQloP)*Uc^((V( zJ241Y4{RwWYgZU#k}L*2)Tg<%RqYrRLYsDX%soN;(HIpuVy_(cuOnr4XH06Z4Nnl( z*x#@;g1I_w=PIWCxvfJ0Jz6;ohk!>CAO7=b#4pAWkc^@o8}1r3XyC!He5^dygzB_J zY`|#T)mkJU2EoSMDhXJe!Bgl}>=+~7U|kZO-)TNDQ% zqfjtJ3Mhw>tGSk2kU3&x(y^WDh*fz)ee#vZx$2TAT5Es zBsR2o`VhgGj0nq2?$n6@u3 z3Xq6YU>;QyN5f@7;vGYyvU^bjOpymq*|S6Sc09lf)$v2%QL`-`LR<$lUev_Z?h78% z-dHv75qYm50+s)kJpsHAfl=af2+??rM zjRAvE8m364OxuXi168TmI}pnuzzmOwa%#&DSIlhugGXb;JrIZQ8X}#j7Izmp2=EpI zp3sGZQ5;*U?|khdUIU^mGy>1iysBB)$=0D7O zhi5es@#3%=kf2JY+B6f^1|Ue#WvH;Lq&cC$ByM1@7NI@ffdV&v~^w^RrbT$}}0 zXZTVK0|W^K0DBcaZl?;Ha@Gpk+$JQdD?DPsV-5)@!VUstC2nM@&_7V40sD)&BAh5l IJ6FPJ06}UYPXGV_ literal 1616 zcmV-W2Cw--T4*^jL0KkKS>=|EtN;ba-+&MRTxb9FF7Dn6zyJUGUZ# zm`o7U6HEjtD52^y00000003wJZBeAvJd@c;={-$7O*9Pv007e<8U%>}08FA_2!d$Z zXaE2KINae=a12#2!3hwQBod)POtKQdKtMzfqZLot_rVSUCyD6^Ds&)AA9-#SP2=Tq zGHK_O=zc393~%L(i7ZdZ8b-Vb2>bDh%XQHrZ6Zta{3aI870I0mG1zbp_Jqa~2_wp<$%VL_znBUy&0RS*5IKNn0v@Eufazgvz#4dx&xWam74ribY+6?l1Ca!fVgon}^Okza z1iI-*5+s9Y^(ik@=e9Y{l+KHW3w*$^Vr7Q*&rma3*D$~uN~No~9086fxI#+u=4mO< zrx*q)WCrz;-*79&fJh5lekKM<2zy*AuN?3K%Mb(PxM)e=ICDJlMbedDZ%886+jZ{LqI6~_}BgwF_ zp7)c?za|U=GD=R#V5p?QvT*BgHg3{MHU_yzSF|BWq^l@H3FTi1JA<-N zv`HaF1>k5v;2?t-99h88Eu$l+jdzRHcc?P(P+QB#yD34K%NmJ}ta*@u4q=Q*DHoEg zisDIhIVGKPrUn^<(RK#`eJcXpFG}*H-S|qL)T9BK=TSN1cWi=`yvc>hB>^flb$mYm zyyPfPAolxyI_jmvjzE+l3-diCOn3s0E9q>9Gs=RHKANI!Rqlfzh5HJX^{2PDj{wc^ zuFeKbU=2zH+K}6Aw%jemYe}JU#l8b%CiC0(U*unG=)t ztd)~>dThm!Y!~O~2k(`w*V6Oy^eC`N7$3>cgBUF`4>(mxCM3k4JwSJT4tC;m@B^CL zgq1+A6zIZ%ZI_UKzzj<1X`DDqUQI3!MY2mm!9epRV1xSYhNhEVdQ6Cq7Ej)E>|Fvt z6>F|^M5^R8ym-qeTCiiQ6SB)0c3R9!VQ!A6)FLHx-*PIFSm(|Ww4NY%=or64w=|Dk z;4twryO}X~D~WjsWdT@HLi_>XM42b%n{5Lr0}6%Kh8lpujxJetfZPDhlVG|QV zqS%5=L;!9q94>8?)g&e{7VJQev-~rFOfe(kUw-UghPT8w<07kRk&BLDfw0Y{pX;gr Oi@744C`fY4M%Do2;=`-} diff --git a/e2e/server/dump/full/main/superdesk_e2e/archive_versions.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/archive_versions.json.bz2 index df8c34e4bca8ea935d666e489275fcc97d49103d..f71ff80d13f4fedbd57fc104454116cd876e35d7 100644 GIT binary patch literal 2479 zcmV;g2~hSzT4*^jL0KkKSx9YE_5cuHUw{w*Txb9FCgxrWzyJUGU=AM-kO@{8I~*=CM7aqCSs!*3}X`!h`_NiFieq{{F6e<31{|bBTu%k zv+Iq--}tnZ{P?Ep>%qJSH2qOE{PX!^A`auHAI>|xNc08m;RYQR=CXH&brOP4yh{&W z`MTjKZW80te8@<+O%D>+fdx_=ZLf(ot_}Yr5ymx7 zW5zag9yx6oUrQH}(7P^+9#_z_Xzzb3qe*iG4-J#i@j)vP`VxmcLyou9GzkwK zF95yETi)LQ(&%=ec=Rw%KuPgG6@Ocm1Kb~Qh)dndCHfZLlDv4`4*=US@zLqZ+F^e332ZozyWI0uEUEGIjnY!8sVgMLb`(dOG~ zx#VX!Mq8s&=BZ9huaXGNAP0ncLxa&1XzuS(%j^u$m!fvF=TK^e7>@3P zjP{v}zAe=dvL^&o4TqjL*5i9>ycnoCqcy#n7@e(=g8tJanOj zhcjf00q3iw5b^*Ui~zNsoNur!snLd0(Zu_B*zbUCh-?eZwGMVIv9xEvOD@hvNMSW% ztKT5G1h}{4Bwpd^+f$%+hgrUNy+S%nAeM$44YFv@G0`6MxOPN|gzJ0ka|NT$UVC?| zgD6En#f1&C#dVb1&>h<{xG|mYX4nUb43O#Lo_EM+NCN4Yp&+C~BP2DaS!3-1;BEKBmY1A5`5r9cNL8?lv~B$kfvK zD&};nnft`^fKNZ%AR!@0QWNMO0rCeCI4>bG(KS!(cb!pz1FT_hSj4u`_Z0Ty>=z%lz;43aT|F@yQJ^k$mytd} z?kDPgL#c$!ZlFLk4R&J#m_G+&ho^cSpr6=~ybQ$S<|GN$CwQ7EiS`?(2hj6RbJ0Gc zeIMP}HBV^!jMXqqI+IqpGZ~D_FwABw#$z$yoyogWVtIVa(R{5=C|yrevz-TUEOKcF zElLH$ehh8W8ceLHbEqz>D}OL?1==KF3zw@@8JTIUF-m7ngb4y{4deugplS}X<&7Gp zHI>Snc5KeeBsRYwm#O$`txsV#XQ%D~Kggbw6Nv|(LGTg;!G}E>>T2)?@iG%3PpCcS z@ZflCY?z3NnUZEALS`Z&5i>mlfRqxpiD=*?!7)62V++@BKJPAXUf&&NojaGj;l7Vf zQO|E(FHOql8yjubp67CCCrh11#`)%XlL%HZ(y=R4$@Z?vD7rWK2s_+n?SC4j$I(j77R?ES<>uq`{8$eBhb^_s} zzCk-FlR0<^*>!p?lL_xtiQ_B9G9Ia_dJbDXlkixa6QX=KP9)@?d55`An4BGEiMpJU zYc8uZ7{d%z_q}duqG+EK;+~x6Qgth2)Y+hMCMFXcldPQy?Ov;7+ z4KE(%COct@v`%T(oKr;iT#K4wd8guerXFe1Cj|36SjUmZSI|ziz~U#0;GId{Uj8C@ zr*d*r922QKEtAaZRlzYhXq^h2m11_L(@aiD(pskk*l3u)vUaNK8m1>QXl|OhCu5Rq z-N4mY!o4MRC%1Ah1oAHx%{%J-={&l{d18La!8CcMaS zKUdkY&FCKmeaWS-?O2}4!9TTXPZ{wsG*if(1lVG)SkXFDwKi*ar+BTNiSV3LRN|g# ziJ+M+Rclr!D4i*@?3@^yMXhT0Royx{Cn3%Lhk|ZTRQ!(nl6V)gtp}25oh_5ZPHEaT zT`IVy`lnsJ; tETeS)qpHL7{wby>T4}XbsiJR&YMM>-tjyXqGxZ<-F64@Ep&*djsq9p}p9=s0 literal 1425 zcmV;C1#bF6T4*^jL0KkKS;r}D1ONr8-+&MRTxb9FCgxrWzyJUGUG)X2~bfCHESCQJY(69mE-0x$v0023wv6A6N03;`GbM3N#5 zfS5<1OpOmnz-gv|27)OBCJ+GBWK-0}QRNx{G{|Y`1X2P33ZOkkYH6SV20$L5YMX)% zny``*3>Y9nDlmXX3=#-Lj0Pk5Xc7J%Wh#0JLqZMDs*R5xpNlt>#lCFWdz{KTkAqW7 zS7EHB42_O<*o!)j20JRTq89ZXcFYI7(V4h#u-vZmf)?#$5J1e6G0mClVVh88cF@>p z#4ya0i&m{ze|D*Gb7ViWH`d93P7DRkn;WIfO{5?eVS$Y?+hJxUn302Knj9{}X2Toc zxeB474QO;j&GdGW{vsMQZr9}m3^`5}B+$SQ_N@Vp$qr(!w=b+ryVF4BjfJP^``^fp@H4;O0; z(1$9{`a18~+kzW8q0z26GD28q2yxYULj55$ywH=cbVDO#aYI&JA-8!UG%1BF@l-mx z7S{{8YqAnRA=6F}ln-+`2Q?%@8C7V806igkNmB};tCQYhmd6@ljL@j+^4$$JhzPFe z?;$RSU^8@Y&WLTsjO5-`vKbW3n}QT!sP;KxSADX!HrFZa$;G!Vu7%LDH`_^6F`65? zh-8L4yzzBRsDxK*xL-tcsG~4$L);9Ipgj=sd{FVbu!K6_!`8Wq9JrMFlN!Cf{X(X9)u^?COq(jq=%skJY>ik zYI>g_Vcw2cqp>U;`XPBx+|)aYHiVfB3_Ko=1sO7Xns_i!<{E}z)rWINq}ww*5ZmAJ z^G%n9Hg5UGPH(mPhQJvWhQ~pj zTSn)b0lW^N*knnl+^ok25aeLv;nq|e**R=u zA%rC0;@HXFTHwRE@^>)qZwALKf2eHyJb8CqMi0ONYjo@6SmTt5)HE}oiiVAEpw%QP3$E-cUR|Ha&qP81|D%3DDIRnU*o diff --git a/e2e/server/dump/full/main/superdesk_e2e/audit.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/audit.json.bz2 index fa3126e8a27c91701d6145f0ba84e218e408b241..697c703d5425b572bddde7242650fc38fd9e47de 100644 GIT binary patch literal 10354 zcmV-&D2>-bT4*^jL0KkKS+(cNodAE3Uw}{mU1$IOFaO_;zyJUKU_w6dd<`jga+=Yu zsz51rN}lZER*gXSm=2VXrrP#l>*2lty)rA)P(Fr%b&3xlbWpW`0O$n)f#mg}pf7lx zQXM^mIpG?^WqTfjyj$A<)fD$Ud)$p0)c`!Zz`e-3h ziDF__Mk6wXiI6f`QkcYLG8DrRk(DKqGLT~`!Z2iI85v24!B!aCn=h8W1e zEQ}SAh{(kx$igzPtYoZ+#KmMxlLa!96){*N69~x2$t*(^3l2u5s|nT|0i`^)?#LD5Xk8n zAM=l)xx^}7BC9GzdXm55A@ZV;(J*8N86MNs{{ML22zW!`K=UK`-KcceE(yEG&2U&d_CXYnVnCAaL zsek*2$(Uv}mca88O|T*8LPL}!Ke8SKc*j`rjpK;<(Xuaj>uo{ zcdOr0y#4g{P|q+(Fd$(Cfg3v z?=WS`3`1a?no;FFYEc)Fo~>pXVIj3%BcjrmSj2Gtio|w$S>58f;>!#eIY#5z-I<)< z&TD0vjdeOw=07DnUF+ENk2v;Y&lXPercc|a;NT>g5)sf^BriejSmaeaTe$FlLR_F^ zpxBbTTugXfiq)Sg5_7-c7Pj#+F*sL0f0Y>bcoco5z%Y)-@d5M_G}m)M_@R)jMq14XdHMqoupTPA(U1jaX{cwT!95 zOU5~s9VuW#tyn7wl(ASYYe{QuvOet6GH{n{ow974D+8G^*}~qITI*{oR&5JJ&}exV zh3^9RF{;`l&f7W}{Td$!Hm57{wUMic}&{C|VhT zJI?eeL8MHA?qoKjLeHcaO%O1UDc}>~7`3`Q2Hsc_Hf z%;yWBj*!GA1Cik6F4boxWsRbB#IrW=M+oLJJ4Y_9BdN4zIPJF0w&BeRQyGl0d^?Wv z1WaO~0?dO60L+8&S4mt-;^ADYg8Q-aN30X#jEK2+c2e_F%D3KI-(=mmSTb=A*Lcm0;B>|T2W#UWFP_dp&=nF0uYLrEEG_|1{o5V zj45jhW)zr=WMqppjRuvHnS^9vQzk)F#34pPM9Dx*Aq=IEDVmKV5rEZ9s?=pHjG}7_ znpRRxNr22&rDBz-ODhy&GBS~h!vg_{Vu;AZYBDmGMk5Mp41%>8O-2H;z?mx{6EF!) zB>@mCh)7DZGBPqUNAzJOsLBguAt=ZSLq$G@p;;Z z+2S$u;5W}Y;13^fp$}Rg!7^xQd!mAqd>kRtLppZrutS*+InlW3irb_ZZ-gR@jsFc8z$o`a&(_Q{}o^)KNFyAG_QMs?o! zd%hFU(}+@XFKy+)K!tD858&f#mAhNM%iz~>*FBu>m(=!eTDEDfy|8mO)+79a7Pz~a zAG0Py49qe&k+cSb#73?UB|rnl`HyIitVc)wDN3q>nPxmB%4900A*x|wLWTH9rC5P- z4`hjge6=}X5s8PV9W)+rVA0ZOX`rBRW6Eopby3m`k6Z(&9Y#oM166up%dQAHkrYT` zjE6Wlnk++moOjm++gx|n_c>u$l5@Vb&XL+N7Ko)a5hjt)A&NXT z);F5!96k7$%wToWX^Dw8JRF!Kz46`Z-+Scn6R&1&5>%r#3yPJtV2j#ZK4!MU_) zOK9RUG>t~|bcTfu45ZLM6Gq}XMhNK}C5YOogCfYX0krS%zyMC%oZ1GA2_qrwsq8M84PHjg_k$-NAzx?4u2xs)`q-0oh3ZY5zc zT`R3E%npsTG`OG=7=$a3j3`wBNkLb7j)XAOLP$se@*rJMx|HCi)laH>6yA4Fdn(+f z3iKIE)}5((Robkd0reG@f7jUzX()()^~Hf5;#frjq6XBMc!5!z2@wZe+DvqFeYR|K|jW zy^xauoN^l=k;_Vn7GWVpZ+rcp$7|b+MSe(6>uxv`Kwc>y2nDaNY(+CqF32jZani%K zzdOO`^`mW>n9>9ybOOkpSPxkxjpF{RSy&P&_E1|OUb9+vYt4*3eWn2MfiOmcSVuXAcVQ%wzRpgDq?Ps1B3$MX)<*LE6A&~hX_g>5raxAnc>=8{G9E{)Rnha zwQpALb6E5s5V2P}}{he%^rUKNp1 znU1=)$Q^9B1fg5LTQi5J?Qlqdh zS>yz$a=+dn9PNNhAGky64Sg@qXqN9^gjd!p z=tLnK`QPL$S*Pa0y`GepWr_V+GsP_=D?e-9PJW_7dbKrOQnv5wmPk!cRmt;k1w3GH zJ6@9n60`CrD`%GHFRN=AU=nGK9764{jpglmQuXt12$hRVMG%vFj~B(UWOF&EFpz&W z3<+U?*p8Nq?p7mKBC^EeT=sYNZ<#xMd^Z=DnVA4o5+NJ|w23=W=Q+veGEzTS`&az8 zqjZZyXPM3MR@;8Ftg=hhz1<;wpgDp!{O}UsBwWH5v*)n6OKre*;!pz#CFVj0Ndioe zQ@55o)RjRZ8|w`}w=(ek*7s@SOfncH)Dkv#U`W~9$tAlPj=P#_lBgvu9>XxqnUYzX zC3;8(#Pv=(ND{}Q`hY12MXE^4CNUuifdl%q`+t;G>H$snT&7iFAt3faBIybMpb2-=(`yJ*-YvwIyCj83)%EPO-YLySTk#g= ztGT|o&$gCk5;t5+a=gGw^L8H`zp`0KOtPFPlxgb& ztQZ>u$DqV5?=qe>VtJ>vT=|)qjKR;3Plv9NEv*79kv@o~93jw4EGRGpv3D>a)y$`m zTjuljZDf#}^;&m2(d%!U^3k3G3sd!~@0+97DJi5cX4nBP{E~)xV>bJ%wPuRT)x3T4 zOm1>)g_4=Z8n}#dRK)w!U}pE`xPd15J@z3p+kUnw{0$qE2Vxiy{MhV?CWoCJ(a_bvEO2?F;WU4fA^c%-V)w%w}_ zY55v)i1qm zfJ>l|>z%vgoa~a7k{7ET@&db*X(3rp8Ozu7yo9x!Yq8onIyFmy9s2&3JEkmPp~Nao z5;~!7J`-K~JbF})*nBB(=kOi+=#QVfJIZ+>a=Y)r^KJXw^g=$R@%iW;bEW|!w4KI#-?Rbp*lbJE^B9 zt)IIreJG|ztft0xQLd5%wQS7G-@h6W?dy2etxRv!h%oV+QZW_z6qDaSa!~!f_03yx zQ-UsbT()z(SB~#%YV@b*_z8jJg*#-D04|i-GXpRgKu**^d5|F*)RhLr??&oT$p}I- zj!rWqfKcfI?b?136u$W=>}Ezf`US#gQdq==`;u4oJ<8mlB1e5{dVF1FJ@f>ryH}HH z)Co!Q`i^3@dSjf$YzLX{G0HSPLR`E8375?GyI4l%I-;)f2sR^}1Q9t>wnA4V2rJF2 z8q`~gndj>9eu1A6s)Ua#EC8Rn}bm#W(WCj=! zY`7-G!2Bo%7eh&MSsFe10j(Y9#Uq(k{BH(?_g9KiWhd_G!MJv^yPQh^?1Du_MoBB; z9&iUWQK*E83?U?I>ASR@B_u?W5(%MJ*w%3WbJO;0*V9kbY*$>Km}YBIVr@xo(p=6- z0F+m$Eh4SCb5-%IXybPibJw>k9{`sCcI>@ck&HJwsKoNsue;i-UXh}^%--!?T_rkZ zU?qy<&@_%<$Jt0!fJnzc&6>}{xwK|<-s)<)t!sL6@ZF5bRa9{1I!)P6A%w)VMbMs0m_ueN#_)c23>r=@1_6B}U_88BW3(Yx1?*G&KHjK`C=TOB<)% zCIFK8fdahcHUur}ZlZDwR`bvpXRM3kvg3r`y58qb1+z4eB-4K5G-<`FoKn^jBNA(F zhUSHu-hd^>wn9<9JJNvK`5{+Z-SvojV{@L86k^f7-#>15$&e@XVdj$B7Jcjd-FW%v zkfnF+hk(`k%rnnf^Ja&cAbt>*=c82kb^F|AJW68U53sq6QT=0>{_)%Mp3=VUh~79?vbk3AykehKX6nKJf}!fKB%X@g zQ~aZ>dn0D40T1c!z!1*g4ts_DheB2(1(YC(O;uS9C5Y5yWMpKf6@~T@{Lg2QOs&O$E893N8U#~cvAoW8pGN9>HSw@E!7ejhHI{JwhM=Znq|eqMa%t#)#) zw`;aOt>6TyYtGV@r%ANrfhA9*S&)}7&d%5LPBD}xi*_q~cXa}s8Kbp|w2ao6d1)bk z54|9c30oPAc81z*SHJNG zKw#{HWRuD@wZ6 z@uj)_s_>6E>1OZh|MHEq0BvC~bR76ZwXctIYG}qxnVgO=0P5~GvKyFjgF&P`y zk+gD3=)6rr;Rca?0BK-O{uSdJ#^laY$a0z?h$GhoBQut!e_{#iY(1%nd z+HtTXLb&+rc(}c4(}rO{Ci-a})kt47l0cR1iC1;aAtkO^3DCFTL2JeD>(5+_+ndj8 zJo5*ygoJ_;7iTpoW-QyUfZZS2mz+Iq$+;KyJ`qnL^xS29PubL1-7x&OWjShKYH{X& zqkklUDqmZ9P=e1p%Mop7`#>eB=maHCQ3qszjyA9$l=F0uCB-kZ`Q52%aL*z%G?FEz zIel#`Q<_n$0uk3o!i{Q2NJC>p4njh554M4zlFTu#UhH($noXuRu4aPe`y?=vB~z7Q zAHg5FY!mMr(*0OMk`u)M+ipX9<6uj05@#-vcMRP3J=pGlY9SSW+9gIP+-=8cFWP{l z(I2_VwH@D$FCEV*YhkH2hTGDWv`g4~LB^h8#$`V?Gjes0c4c|Ka$c_Is^(P0dFmrg z+FP@1<5ZL4?TYmv7ku*_NvTai6o#807h?B9Jo|uZpTZyOc9*AR$JPtuVEB=N|Tc}ImYpg z8a1X8Ovwk@lwe!cm2L8CzV9DL97f*$efl1pN755y93Wu>vrVw;z5?rv#_{YR+(5_~ z2eDrIwoj@D0ISBg<`s2TN2N*id})8qGBPq#2*|{yDSxCNb4}p=BWTqu%2;Jo$jM6& z9TwG5$Ti%*8Du<)UpFP_{&4DwXLPjw5TdaT=P8M)gTzCPajIH>Em4 z4+M`867A{f5#DlJyk4<%C9cJLc#L;B?!Zdf{*EEM zBNo1@J9_4R_PXWN)0bGDyJ(hY77Q@h`@5pBd*Q^Wg}_NT5#DA}glcD+p`nlB~i z!%_(#N??&86J{?hDQ&gP^P}rdh#$8Mcae!VGNOCNM>osY*m?STe0;tD#eJ$@-UA42 zJSUfxll7$#eIJ)afntij-MoGNQr+jq zYvb?N-lDU&qn2_D6#K z-IKv~=WVv=8^%WCd8qtS{@B!HWOgSFCA}}v{GE1qxl2n;E|J^U7+ABrbD29fRo-?J zwBoHv#Vyj+Q&!Ywni!$1?;9p87DUR~F`(wFYUWH=Qvvx|66dRw?oGc!|+ z&XLSxmZP+6)NvdmQQ9>cMx!IFc)YS>GZ@-FU!Uvr`h9%9BhrL~3lK^Y5KxH0Aqq?& z-6iZr#4LDw9gj3V?HCTCOTD35Xh7bNNcL>#TKq;{PSvqG!a7gWGPZgEl<^q8mew)F zP=b=$&okW97)V~}h{B)=YLor}72RxJShaaYa1!h4*z0ba)#U?$>`!vvZ)Z2z#-$hB zt5+*H`PARbM1wA1GlTjHQ)v8^)t4X&OdG zs%la8rKr?-Hb&I9g5g_MD{8`FH1k)+PP|L3sgc6T8pJc9A&AN}rOaxU@$Ijtx4*yB zXWQrX`hI=i2=Yry&q|M2_@(C=Da?HK`<6%GmniE=dkGx)`FV52ns9VHoPvykEiHry z9t*T-PMulMli>>O^YHM5^ZL;Fn1tD?L-JI4D`@yj*s0MuSHP_+$i5|c$@~(>-8ZGg z3uL-RB|mIdaLmO%za46wwI5RaM)~`d64w z(39*OC5RZ_s}pNJ-?R2~I~scJjed(iH_Y#N z30??IF&djBFR@y~+AIkZ0V1Lq>2BxP^Up3$de3m%y)Dza5dCsIY-vZGrR>C4)idel zxX%29s`S)p+Io6;NHIHOh_5tGojW$YOV7RKs}zfK8^0L>RGfE2K^@g**?ZSnC9pBH zgo0nb2tsiR022F2AWIj=rZAa}Mpn-hxT1aK8%hud!h3sLw_dRM*1Wxnbq9Co= z0EY<+KLI6_5-%BTc~Pv{jbR=1^oiVF^Tv;2zS_7+s~MP4*QKV{?qeNva0~D>JDHi zQtB>y(4Lq}q-qC(H#*Yrk2v$K<0i5)JY_4fRn;r0I)@Z_NU)fa$jVJ2KYcb=+&Vo) zsL4$~iK;eJp&FK{S&~0hFUZI^Rx2t^O4__*!m_Xp+cP(OTUTc*cn}_$5d#ImD)8JMpES|qBR*F33syKny%C)l{CDQ(HR(wiafCnV^OgfjEszr z`9Xk&)egcQqy;*4s;a7?JH=OZd}TV4T~$u##CrlZk9wU_;VzXP#pa{A6X1&}ptoYW zsGOQGVzp(x$;IDTvNPg#+D)piQuxO#jfb3dj3=&Fgeuy&h0I;SE(zadnVLtBONuqJ zTBw^wU#wvk(TX(~juj6ElDJtP6> zE3*1Yz^(~`+On$C(=Dsylh*;gz((a|CCwUD%&TbLMn!5GOUq>5yeM|BW3oS3@<&14 zOTkxx9_0M+EV*HFg)ZLVRN=KCzMcsgb;3KHut>Hvjo&_*M33^vTu> zf>%OhR#_e~KG5_>Nb?5~vZ&n^`WvB!%JU}VX)CliljFu^E@e9uk0bb%a|d9o7Q#=A zABG;|DSxbDI?s7W&QsYR2l(wv?lUPHG2WoxwJcmlMf{1xcSkg}sMKU=RLH>0CL+lGil2FZ zlE~dH1SZ^5~DzqnpI+Bj$dB@Ty>llwR8B6Af{@DEKVltQ6)>kyV zZoLX z$l^n}KM|C^F_E<_j$)3IoP!FQGO2Y|DlbVkH(seQ$uOFf@`!UCqa&GbC~_=MRB}0s zHX~(-g4YGOiW8ZM3d9YWkXKwWw-3rNdSf`20<-5pVpk&vDntyUwTo$^V%WMqv-qeezOMJ@L5npY>IDU4FUE72#4 zxr?GYKXhU=k6RGAcY;<5WyM~X2X^1bO;tt+^1xY**#%3B&& zG`KmF)J?}#b}N}&tr^gptQMnVYGJ2%(Ha{GH;z^tQQH#8Uz~8+k?fYBZx|UH8U{y2 zb*3kYyr#;Rl3%sbhoQ1MnFi9gRsuU#Ao!)qmwl4vH7UadH5pMFWh`Pf7#>uy7lJg5 zjw6~|$qmu8Vl}2O0|gq70z4I%qaA6SRNFDSxfc%$hWN1^nMMn*>Qw}ItH zGH9bjct@f=rCsougqU9Hzv6CQ(y5hJCG<})M|55hsPvL*IjS^EYMrC9Taf!l5!RB( z_fJYn?iJ*37)!J;OX)i`QLz>tgS9RtA4prE{sRjvQzj~6e1WnJsyW4i%*0r-jH@VL z!-k~fp9t?OQnFU%>sF=}uwodC46Y$4rWFH3NH3zK)Tgu^gQT*?3|2-ZI$ucUHA_g> z5vbPmxQ*lQ85l-J`rbOBGCQNJbWt`xGh#Z&)-_9W^f!%D!Z4iD;xQ^bX@nj!`$h-H z8JU|a1s^NWBZ5Bwj+1OO541PMth8o}PL{=e4Jpc7uG|&LiB;(xk1}}5ReZnsQ&iMs z%td5ii3tT{0uTY96Zygm^7KD<$>;v6F(@Kp8J40ZT0gF0<%DDzCzQL4GR|7c%&gh2PG7Q zW4AD-LR03!G=-xO!CspX!8T$TCNx&Kb5TWYM+J7Qu8^WbTP=d=*-t@)aRD;m;SAX! zrZ6N<8w~~sk`U{+A2gUoX3N7_Xi4-d{oY zZL$;;NSh588$yDDj@VFcngC>A zMi3++O%&A8sP#5bW`qMnYG?oe&;TJx5>xb=nhmJ*jXgs~fB+w<1Ju(dnhgRaCLkaP znrZ5$pP^6Eo}ua*8a*MVhp0V9)CENlKnMgzQz_{*(V!lqKo3v=dYr!Q+P&084uljU z6pC3{rivN}iBd=+0EP%5NU8z}3RnsWTBLzUqGgF9Nm&V0W&(twkVr`qMgR&Rkzj{WVlw~MjB^g#wpb~#g| z9G~mOvE!Y^0P_EXesbs(d5&Ck2tHw5)`YA;NtFJW2moxX1V@^mK@~0!myqp79LKum z_-0VMGmoG(qYRmo*K?|K*NFS7sqAYT(J>0yyAj#8xy{A=u<0BmO~+unk00yE<$Y^! zco-;jOffk8Uqe*H2qsC^ifs+*nuDPX({+R4;lINq$haQ0r&BU?lx$oMR>W*NMij9f z938AoT4kQqhUY=H1cYp6{(vkPHtrj^uDT{7b_xN#&FyOZ9|~+jlxT$u zO*HZpU+oZGF%z&^Gh7yfs~&)t6^s_BLNz&1&gYf!-D0vUa;di3ETTKGCQ*QF(ztE45;mI$#Bw$c6`3f8j|0IYBkS0a=OTSf78}Ftd-{RYQy%a+5lRuk5azq_vA5KhbpQ-VTFmIa zmMpnVy2eL&t+2@8FmkhN&97^g7&B%z%N#+v04Q$g2uT2V6J=kqSr59<5Un>aX8#aK z)kkzxsFoErQjk%#vDB}tao@X!!9)pawCXWbKhe_rHR^fTS}Hm4r2) zAX6ST+av4+I&!ZnSm+9I&DR^dSCu1Wy0_2HySWKzGFBwrf<^%W%~&?Lepc_idG$4c zBwG8-bwDHt4D{4#;4sN|h>3_;K99%vpG^|1ujnL3v(Ar>TjLv-r`B4RBg7QC{a}wf z;DBWX*m4CpVF5;Uk1nw%=mw0x#QcyXd_CX_!UMANmsbMcKNs#(mRjAzCj4~{$qBwS)**%C46%6h`UR5e@%gaApjacZcrg!8BS4* z@dzsd7j|!4U9yMn0W!p`okt!it$^E?cBcTQ7`tRSXS}H`tVxGdx0IEsiq9AG6^cXA zj`^x}qjHK;*u!-yYZS&`6k@bh5nl-b;8`km-h2V>eAQ`Ie_P8_zJVfi-6iN2n_&n= z+n_)?6}(NVYnhu2%}UnOMvLn0?JwtZmB6uSSv;BG2Nre9Ro{}=t$#H9JcAz7&YcM&jDQarP24F^ zJ7Ko@W!{0~c#VYdKtdW(Yd?FmR}c>@!nJw3=ej)GdGrcPJ!4%_skzSuVyIfxWoxy% zocIV6l8A!p2=E0zAR|Chz^6Yd0kQo%bSJ%=5J=<$=m{7?nR%%url|Ht z=+jD1WL**Zi5?Nuj_B4C^5N)(fj=7%{9~5_QX>R`f)f@T0y3#0VKpO8AR=Fwj(-wc z&lCf^A&bY_9UO9ap38w?SOa%{PIp!vExHJLzI(xhJOYvnfdJqK5-N5W zL3RaXn(SVxP?ao5P|EiP>SvWP1NpxPlTk7PgbI+sV}MZ#qKiB&rX~-!w||E(&(W^m zKGV%309~xzl38!a)tykHv&Hk^6{qAX*XI71wI{I)pfM(N-JTM4Q}Kp?VAUNUX`Az4 z2CFAv8bJuvJJMtAeS;`4i1a!3>gDUdl}XbcN65pJjtF2Gbq*qpW$m)cG)x_s5E4jP zDz|N5Pe9@EzsJqr*7=8t3ICBQJ}R6CxcW3tm(+jl#E00wdG18mrxVPPIBb$I9tMN2 zkIWK?C!@lpu!3|00uBgkxmAo?3 zNfI)Q$Yr3?(M1(RR8K7=tg+yP{4jS=#SwBU9y&Bu(Pg>#4`Qha&S7l7965Qx$5#*nXj*MEBtZEo-g4t>)c zfH$3@D{E+KZ)^r)SL_go!4jSJgd^=A2rqo(5QxuqQ}VTm>QcGup+DbmW3IjCe5v-5 zEF>Z*>Ld>%$Z!Gl)k`G@0M~eHoZ)TUw_BhbdPiSBN@|k&zQ@vqj&D9}tx4umX;bOM zAm(YV^*Ki`y!Fql4uJkjFd;a6$I6kBDFg|3p0S*B+V_yI-EnbVk8~0re^x$F`$IPKrn^7a3pQNUk%gQ zJLfC%P4VA71UHbbnfKTUAI*5w`|0uDBQ=vIY?qmkdbRc2-I@m<%>2MlQ1l64J6VU*xEZOpxX*B z8*v!k+GdHx6EK`eN561Pe7F0YZ7P;pT12I(B||~u<#mpqEH94B?4+6XRjRGW7xCcP zr#m9&0QyF`HriI|S)2&YEk|d0lRW2}W&LaQwb2ma4iMv^>L6?gk}@j{?GE6}6ddL+GSkNE)C;?P}4eLBxn8dWug0MJqvc>87WD z%(t^~0aDZ#XcDUlz9#)X-?zWf_U`GxVL0FgmcTeNC#J2yqsT!*qy@l{wmQeNt4JL1 z=c)y;vK~kg0_+E*pvQh!QN65#gw}5y>Ph*BZmoA>A@>4@az?gMrpU z&tfJ(afG@AFcYLhj}~I7DWZxBrichCs=HlY4v_AKz)GZIk-M*cJSYhdA<*2LFD@~o zL6Dsav2}0+jIaSCNgvO=*v6%O+r3kd&a!>Y=Dpyv^BM1wt@mc-JBfjmARFrhg@7&r zfI>5B`Gg>BwPPM`+KGMpQ49wUFlnKlmf`9fuZxhLKI))QjJ727VJ18V5w`YPhEfz` z1M8G_hDko8*qJk6(2Is7@rd}GCM1ZJJVetfgPIwrZeOT&bOS&WAUhq10i97GgovUA zK#++FKxu%%aEl`CQi={N49~i@eU2gc!5o(>s5cV^{C&Lv<(j^MuBsLS!?{&7P%;7v zmwf($8LlZ%|Bzhwyr#XdsXjwg8omh}b~=eFf?UR!6#Z+TutdG!lw&nr<4e5cB!ez_Y|XBqlbn zGlrkgitP&E!IW{uEZq@<7ntqE4u8s?!p8kQPLe2-yy!jWPjjEbSfa0vHsZ63a?7ea zo5pZn-Mk_s}W{soaR;q=sUKf^$rPMbDp@`!XMASBeq4**;kvIjCWQpY?>Zho)^R5q4PiS)^=}z{Ub`w>n z+W)suG&C>WK<+}E0ADo(zKT}WNNKIb!`bdqic%UX714uegYk*KIn3r|g0z&7mw``Z zJcDcoo)*%oTwr&y8bP1gxdw|Qn#5F)s}w9MT29nri+)l^uvzh#3idYiK>2y zn3+RU6c#y@DZr6_?PNJ0b)Hu;?*`GjEKC$m6$#=QlP92Ai3eCCem8cKK*dNW66ifA zb=s7n<4ale!GwX)-l2y2)LVtqaH68#RFxQ*#Kwd+BOwGah=UWif-b2eFpI1q3Q}$c z6lo)REDXKgrkv^bqyu!3h+8+4KCu_BQg5!#-3MBBo$7dE5$(BHL+_A{u`H1SksD8v zrV1n@tW>R^R1)zFVL8d{q|zq>Iz*^ij{Ib7EG>p6sPrUp7&cgIA>_klwj6(AVoHXv zOxqKVFk0|L&kY#baj|73ksb$ahRvV3Se%hIIdPFWqK70mfaoytW`sL-B{NLci-7_K zLYGRjVdpZA8|>MMF0&<=$(c+#;K0cfP12d1XsCTPWqgJrG@|DSyCZ~^?r9kj)P3!w zoy@ov8HR|U<0&5Fbmfu0Bx5pa0e+4c<&N1yoLy69C(cgK6>zi`yABZS|0*-q@PHhM0|Jl!Kg#gy$!{4;5{>MJIdAV0(#Vkg`H1#_JTOHaBVrv@}y=s~v$# z#@3SpB$Rk$v9Myt3nCMhhJnhFq0jMF7v}!Z} z00F6{n2e^IN{oO20t#lDj6fO&fB-6{kkdfbKUC9AH5z)Jk*AcU!i1oLP$l3!b@-0v zfgh-ZBl12;K>msRM3CY_WUi7%J zR|I)7T_K%|4EKr};l%bB?QIK5ZET+ODLko`Hnp1&le$BzU0LdQ t9)~h!28ZCO?sXjxCMRMEh$a+>uTcBny-dRlp`IhhJnhXLKs60ULuf{T z001RZ(8)GaOjKk501Y)V074A|O#lH^Ped|lG^hHBiKNri^o>7CXK>8I2rz+$;mY3e z$qF5I&J83|O9nh6a+d)1G-C5ZYUlMN9J*DC-XIOT1KvT)VSY zkC|0MSd~@La2v!&CY_Ut>?M(Sz&pKJZth;GIwdq4YU&agP0xa(tPv1SnI=uTD0Q6Ylok6JH2Ddm=qc4|yUnW^Mwgu{6`s0zK83^=u3KKZ zapQuXNBGWnwwAwB6YT6dXSW`em0UBHehw9|;r4Dl&3n_I7?#@hmmKMRuN<0~&ECpb t+=z2&JG`p;;R4v diff --git a/e2e/server/dump/full/main/superdesk_e2e/content_templates.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/content_templates.json.bz2 index e98c89e88f1c294aa5d322cd9ef55e9af37e5ae0..08e60bcacb0adf65c22d33e2600a68aa85e9504f 100644 GIT binary patch delta 590 zcmV-U08a%_O#qdn5R4GR0Kp3kFvKW*$WW*~ z)c;FQu_75Bhrcqb>37K2n)QOit0+5KQNE~xgaPWn#ZApj-p!zT$6}0Lu9g-E1%?=b zPJcc|Uq77e+K4F~Js?g;I60>}DJ&)Y1m^w?LpLocrmO8LoN6MM zneX3?g=}WByi!+=>WgcY2qh8%KwQ^_Z7#AkjS1LaOHG*6IATuA%&B&Ytz<=-BoJee z=gO-v%;W+cPDewbM33nDlPK}&*v$4ioquiq*-No$-|66dn%)q}4>C;8HW+C6zh-ZF zQ(H&JzsdS{_@qjBG8~H%Z+3_AS!rVr6Ki?27;Y+dTJb7no#MQn zS(y&PVPH5ngPog+t#N(bZg$|4Ci8Kaz`y90wmJdBCAou>;yV{rqYkYIW-@pL12<(E zT=2Q(=xFakA-@M>j1`{_MotViwl|jWX;BIj5=5RQ9t_&r-AHg|>u4A^H?_f&xUg>% c;P)gqe&G0XG7g7XQ2)i;kxmpO7Z}K)fU`medH?_b delta 592 zcmV-W0Fn` z0000OXlMWc4FCWD03wirWYa;U#ZOO0rl!bwPg6oYG|5_N1g#i^V1^h52v}i;Aw%v$ zg+c76{#t!W5XkdAxfNeazr$v0)(Z}dpzCQy`l1RD2crWOH#IYQwt?v#N-=u6m{=ed z7=K~~ICz-+J`=NQKI;Lggp&y*AS4hlQ&!aTfjFF?Tp9d1r(Duha84j`>GJq>|C>Kecc04$P7NZ1;yf?!*OSn*;_1t4;Wn;{1j!k;q) z8ZjI&#=CS};sPBGCo`EukD>D>QQ^<2nSbhZI$QQ-E~Te`pMl!e?}kWu5@vZY!$-;b zvw0OYw0pb!Uhe-7+2Mn6f#Tp`{Mb84=F|^1)AIT&wYmo7ks>3TbE54vITYzF(GRHT zA(80UnCmpjvr}P2#9_YnYS#b5xzO6?zD0@ZYc@L=+Fb2npycmE?oZT#^*aJXFn@oJ zM4asw-J2P;6ng`YYw`x(2HfrFL%H0;BXdI$#IYv!>3(Yi}7kEH3 za-%Dq_dJ~~9mqsC;N<9nv)#nS!8wN3(%tPUAwptElfa|Bn_FA04eZ^G0|w^yxG{SR e2Jt=5VncWC4|g*l=5&=0=)00B!i0y&YC7=o^bN59 diff --git a/e2e/server/dump/full/main/superdesk_e2e/content_types.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/content_types.json.bz2 index 17c85a6990b60dcf14a114d1b3d5c6b6aba9bf60..49abc7ff2d2b2753391d14037222f03d720e3581 100644 GIT binary patch literal 921 zcmV;K17`d}T4*^jL0KkKS^D&$5C8)9-+({>R0MzU07lG;zyJQ~Pz0IhX1Uvd00P5E z(oN`TO&WTDG5`PoH87JT^q;Ay05kvq03_6r5M&wwri0XJk)UYMUodlZG>qJm*bC}I+< z;N?0ea75 zhMl0OVEeana7|S*Q#SC-?W>GMpC^16XHMAJd)i;e8u9R{K~Pd1y#9@wdPvsqC*7+R<3-DG;lol10F z=DVBCc2U%sB=$*WuH^7jjKAI<#j!^6DXT<_$8rncl-6NAjxJ4EGmZR~3)CKqIW>a0 z*$>Rv;`9CZ@~hhWNxv}~NIE$+GTKzOHEh*CM}wO-t4L|%yJR({99YC&U1sYSXDS#h zEbJMYt% zOw>^BU}oMP6L%OpZ05ol{Lq!)VGEe vYi#i?iwKO4SZqQ=46@}_MO9T%*|x=%&2?BJ{APjgU*hgarwS4uUX&sL?=-eC literal 914 zcmV;D18w|5T4*^jL0KkKS@*|K4gdoC-+({>R0MzU07lG;zyJQ~Pz0FwX1kW)00D56 zDAQAFc|ZZ7pa1{^O$cbI=9JSQ$j}1;00}iDnh?-v0iltj5uu|&fEsAfX@~#-20#T# z5D1tEX)-378Z>A$X@im%k_Ze&5->(V5g@?@2@#S2$S@K>hWKOS_W9NtM!gLqzPD1~X)p0)U~A;oySzTGUlf@_ckbWz3dLl*8PlF9jSMikBB7nRug$RgOGB;jzInhFDNJX^6^G6k2Dwr+Fm_8__`Oi_=|aN-tzvK*&Vn5)T2M1)$|vTD5Z~ zWM?dsO136OFpmfm=tmgYFqMQcR-A(l^mopfU?%yZ(GWxuo&4%b-NJ+mNt$xJ?kY8o zVOSMvAfjAdqi@oR<~I~4S)hT8frz6ioX?U%->(IqB{7g|mknDR=FhG(qdKbis%E;F zO_*_eIxv6xhWOr| zF=HxhUa1aDr8LB5vI{Qn1&WbMJKezL297TOKZjq+LAmhc^l(`oW7?%UF7{o??7JxJ zOpGz}v8>*CGh*o9y|iMecaT&Uq`^0KUMF`7l`5VP#%^uq)yEYnr87}O!GW8E zI?fI7bB@jP{@>vf(ILTe8O|ef?#;;|*>oM_Sq5wMw`CUG?y0Ulo=bJYt!ocF> z3ULV2@XBqJrBqdoX-4{iB0Z>p7}sRhuyz~MCAM(sct`>>Q(5&ZQo*kw^OywF*W&I- LrwS4u746p`7`QG< diff --git a/e2e/server/dump/full/main/superdesk_e2e/users.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e/users.json.bz2 index d058cfdd56a856fbdcf40af4470c565a2352de72..98f0c857f22246abb739d3ba03567f5f1c5b26ec 100644 GIT binary patch literal 1187 zcmV;U1YG+a|L}j;`#Qh>|N2k_`RPYE9PB#cidP9D z2%9O97zv_!kJU72&=~+^dW?Z8H9be7X-w49L)6F{NCrS)hJZ8)H5AmInv)uU05StW zXgx-mGypk-z$O4pCKF5m047Z|3?xV-#A2tT)YSDoGEEu)0D6N!(9>W;D8v+CFp4UK zSi~a23|Jy0P#7T)_D|0*AAC9o~n3Zv|@BKV9lXU@QEI9NAIXyL3@ua52-)T?KF6pt6u^xG1cujAzA0MVKw3 zvT2h(@Jy9ur~y*O_Nw zQwtt9LjV9dG4sD3I6#AYI8Ub)CV`9@p>;c&?t|jW8JK=r{5XE5O}>3E@{K#<5Z|_* zNlWhM)*3$_cnJ4T;4=5P?YPz2{#kR7avn*|vd4vxounRi*!{l0XIBb>ss`y{mlNt$ z=&j$rN|I0XOrn>CL&q*&vrg=XgDo>GRaxQ{&2%53gr3Pjy@OqWpExV6?ImQjQNP

    ^7GvqaU!MuKE3oW-HS6KJ8^u7uT| z(BT_&LJV}5+c~iLP6Fj(c@{i3^YU~<3_v^qZsx1S9alYduP!DcijICA?JsVvG<3mk zx8uEY!=huX-RcL?kp&Tk%Uvr=>)Z-pTWU){Ddr&^eDp9RD8O9T9n#mHgfu5)F@!m} zO9vqn=E<6KcBa~^Qe1C|Q-Ea@eG? z7Ui+G46_fb8E6z;Q@95<2DMy)^6|qCjc%HoVQ_E7DFb^Hn%g1@!!bw&bI>(p**ct- zDXVX$EDSsJV}YJqI6OgyZrUxtqm&$L1^w7_NX|u_{toHjrEt=|yCz&50zSMK954wb zQ5P~W(5==)!N^;cgcT=7jin|MapcBaN+puM%~MfxH|dmsY%NcxBci1dXv)|{S)Kbc{Atg zc*+k9YOZZ*UaGuD!cJ?xfMp{nOn`_kbJ?7!S|X0pgXUu%q*}sv&f1jinz_|h6^JYt z1+_=gmeQJW(z6wn0^wps;+VRGN{r1UOEpqhPJm(FUz$|F78o!O<|621lkd!aI#Wi5U-YG_n8sF?l$fvhyOJrwgn)19PPopL BCTRcw literal 1203 zcmV;k1WfxvT4*^jL0KkKS$I!;bN~WBpMX>a|L}j;`#Qh>|N2k`8K zgG~Tv8fa+I>SO>pguo^MOePad001UUGz=tALTstz(KMKb)csRxXaS%B;)6q6A%tQI zFc~7M!YpG2kx2$D7>tSo1R@^U`TBDknT#h<%~EDPc7!R>y5R^h4+KK*t!oTiZ@bKs z8Sczo-SjAE*k7qF)70wuYtfud?KX(OSNRe%CV|(zbWve&G1-)DC3Y_`U0nrTYND`d z$0V~jlO*P?l4OnWBu3cc0c0X)BNo^IHX~X}NED(%k|>}Ik%~-nfxlJ9dUkHV3lH!y zi6RWkw1sZMN|A|SZ549vQkQnsP}*BXRX8sNA-hh4+}BHT1=7^oxG; z-M#HW$>wJ}<(d!%u1;s$w-pe~-9Bn_@~OVb8>HN!O7C>qdzlxM2y5i+&y9tT<=GF6 zslq`XzM5r49qxUhZ-;ykzCDs;GWj_BOS@m5IFNE4nrUkzl%Y+CdRnj5)3emrg2e-K zu*+%OV)!X>NntPJ5!{(gFD&8bU0rV0@@72QTOvxet7QRZS>X7vlg@}5SS29h;ssRh zJEMPPkN)fJoYGsFEG`vU`0pYmAxRlb)t7@*R=X}+?>br4eAP=vf@Bq3gztm_HjMZ= zI_+E4*+;-OJ*7xNt3j3INrSRZ6;(~VRkd+(Z5}vkA@NDV7&&LW)Ni^v)q7ZqDmnW3 zJ~OqN(;=+;c$4wWb)&1XNhnen!Sa6H^}ie-s0G&~y1`EpGTGI6i8K<5UHi@R=G8(v z)EXI#d3BN;gjaJWYD!(R;aZpn4G}W4!?E7fumxuP$^dhC*e&!-+ANz}4mM|e?&RW< z=M*qkHUljKy}a~m6$-U@r-ZVKaQ(7Gg_}}^T+`A^`x2xVZKb{=pG2B$Y@|ZDP&ssS z)Gd0gRt4BoHVlL}WuNj2J`8dhL?CT9pc$T%ZG_Qq z)zOl-mpXY&JC98Tr=eb0!-nMOimY48TLxB_rw0y$7=qZpjA+&ksL0e;W#&In3S}Lv z(~D@7$^ofbxO(ajLt^FkKqAgm3DP+ub^{uT2pqz=FGEonr-WP(bV{m%92L$8rmW=< znWoM*Z8^0bZ2P?rDZ|GuO9s*7NtR2%-i^vRtj{DGNlpq54(2T_cZt$yn_QUO3^3Xe zb_ruE(4YEC2BM>?h^W99pdVT2oa>EN!CPP#ixLz{Lfj&BZOs$YRF^)RY6hMVEtqHp z3hYJdPKY@%WgM1KVBGI`mdpXFQ?-!LxX!}>SYW_En2Uo+EeB-7<2)R$7SMaP4mA{y;_gVN3K9~wt_`5G Csa2u? literal 0 HcmV?d00001 diff --git a/e2e/server/dump/full/main/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 index fe4aa02969a58bf6baa0e7fa01ada14384a2b439..3c57ef43e2a20eed56fa143764a18e52f6c93131 100644 GIT binary patch literal 108 zcmV-y0F(bhT4*^jL0KkKS?o9wC;$K`8-P#+d+-1NzG>eIAOKLt6B8x^U;rAX(l)24 zY3gJE!XD7TQRXFEY&=+@VRRRFDWnj}F&SBhTTT+2frh#DzKA_(%NkOws-X~2X^|h- OelFySaG@dCa3W9(Y$@~r literal 111 zcmV-#0FeJeT4*^jL0KkKS+8P;qyPXY8-P#+d+-1NzG>eIAOKWEXpc=pO$I@c^>HlSoQ5+D$2@U8XCh9e}4(H*qOK}=Tyd|7ohwEMAy0FDa;FtdxyQ5CBr5eWev RLSJ3@yOJrwgoS$)Js_7wDFOfh diff --git a/e2e/server/dump/full/main/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/main/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 index 2e6ad699872be2a8f177cd604f65742c3abef027..6dd717ab883d6740e7eee8811fa11adcdcff0be8 100644 GIT binary patch literal 116 zcmV-)0E_=ZT4*^jL0KkKS@>bg@c;lSn}ARSd+-1NzU|)%AOJ{+CMTm%^*tao8UiTw z8e>88#6Trdg|?NSb$Ekpm#Kz8zYw~%tTVOv WkqCpqMBz`!{9VZu;X*^1NeN4hrPDzMsUK<^alVM9c% Xw~+{jK+<@#<$f;Yig2MJc6Pe@r42JV diff --git a/package.json b/package.json index 783ddc840d..76900856a7 100644 --- a/package.json +++ b/package.json @@ -160,8 +160,8 @@ "test": "npm run lint && grunt ci:travis && node tasks/verify-client-api-changes.js", "debug-unit-tests": "karma start karma.conf.js --browsers=Chrome", "unit": "grunt unit", - "lint": "tsc -p scripts --noEmit && eslint --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts e2e/client/specs tasks", - "lint-fix": "eslint --fix --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts e2e/client/specs tasks", + "lint": "tsc -p scripts --noEmit && eslint --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts e2e/client tasks", + "lint-fix": "eslint --fix --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts e2e/client tasks", "server": "grunt server", "dev": "npm run server" } diff --git a/scripts/apps/archive/show-spike-dialog.tsx b/scripts/apps/archive/show-spike-dialog.tsx index 92b54745f9..ea8819ff34 100644 --- a/scripts/apps/archive/show-spike-dialog.tsx +++ b/scripts/apps/archive/show-spike-dialog.tsx @@ -40,7 +40,7 @@ export function showSpikeDialog( if (skipConfirmationPrompt && warnings.length < 1) { doSpike(); } else { - modal.createCustomModal() + modal.createCustomModal('spike-modal') .then(({openModal, closeModal}) => { openModal( -

      -
    • +
        +
      diff --git a/scripts/apps/dashboard/views/workspace.html b/scripts/apps/dashboard/views/workspace.html index 8e555c6c37..d7416fa241 100644 --- a/scripts/apps/dashboard/views/workspace.html +++ b/scripts/apps/dashboard/views/workspace.html @@ -10,8 +10,8 @@

      Dashboard {{ dashboard.current -
      - +
      +
      @@ -64,7 +64,7 @@

      Dashboard is empty

      -
      +

      Add new widget

      @@ -73,7 +73,7 @@

      Add new widget

        -
      • +
      • {{ :: widget.label | translate}}
        • diff --git a/scripts/apps/search/components/actions-menu/Item.tsx b/scripts/apps/search/components/actions-menu/Item.tsx index b88704f9ad..bedd3406c6 100644 --- a/scripts/apps/search/components/actions-menu/Item.tsx +++ b/scripts/apps/search/components/actions-menu/Item.tsx @@ -145,6 +145,10 @@ export default class MenuItem extends React.Component {
      • No Desks Assigned
        • @@ -27,7 +26,7 @@

        Workspace: {
      • -