Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ch33576] Update packages on apps 2 + lint #1905

Merged
merged 4 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "common_ip"]
path = frontend_ip/src_ts/etools-prp-common
url = https://github.com/unicef/etools-prp-common.git
url = ../etools-prp-common.git
branch = develop
[submodule "common_cl"]
path = frontend_cluster/src_ts/etools-prp-common
url = https://github.com/unicef/etools-prp-common.git
url = ../etools-prp-common.git
branch = develop
2,108 changes: 1,236 additions & 872 deletions frontend_ip/package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions frontend_ip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint:eslint": "eslint --ext .ts . --ignore-path .gitignore",
"format:eslint": "eslint --ext .ts . --fix --ignore-path .gitignore",
"lint:prettier": "prettier \"**/*.ts\" --check --ignore-path .gitignore",
"lint": "polymer lint && npm run lint:eslint",
"lint": "npm run lint:eslint",
"format": "npm run format:eslint"
},
"private": true,
Expand Down Expand Up @@ -59,15 +59,15 @@
"@polymer/paper-tooltip": "^3.0.1",
"@polymer/polymer": "^3.5.1",
"@types/lodash-es": "^4.17.6",
"@unicef-polymer/etools-behaviors": "^3.1.1",
"@unicef-polymer/etools-content-panel": "5.0.3",
"@unicef-polymer/etools-currency-amount-input": "^4.0.2",
"@unicef-polymer/etools-data-table": "6.1.2",
"@unicef-polymer/etools-date-time": "^3.0.3",
"@unicef-polymer/etools-dropdown": "^4.0.3",
"@unicef-polymer/etools-content-panel": "^5.1.0",
"@unicef-polymer/etools-currency-amount-input": "^4.0.4",
"@unicef-polymer/etools-data-table": "^7.0.0",
"@unicef-polymer/etools-date-time": "^3.1.3",
"@unicef-polymer/etools-dropdown": "^5.0.0",
"@unicef-polymer/etools-file": "^3.0.3",
"@unicef-polymer/etools-loading": "^5.0.1",
"@unicef-polymer/etools-toasts": "^1.0.4",
"@unicef-polymer/etools-loading": "^6.1.0",
"@unicef-polymer/etools-toasts": "^1.0.6",
"@unicef-polymer/etools-utils": "^0.0.4",
"@webcomponents/webcomponentsjs": "^2.6.0",
"browser-capabilities": "^1.1.4",
"dayjs": "^1.11.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import UtilsMixin from '../../../etools-prp-common/mixins/utils-mixin';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import {Debouncer} from '@polymer/polymer/lib/utils/debounce';
import {property} from '@polymer/decorators';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import {timeOut} from '@polymer/polymer/lib/utils/async';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import '@polymer/iron-icons/iron-icons';
import '@unicef-polymer/etools-date-time/datepicker-lite';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import DateMixin from '../../../mixins/date-mixin';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import Settings from '../../../etools-prp-common/settings';
declare const dayjs: any;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {html, PolymerElement} from '@polymer/polymer';
import {property} from '@polymer/decorators';
import '@unicef-polymer/etools-dropdown/etools-dropdown-multi';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {property} from '@polymer/decorators';
import '@unicef-polymer/etools-dropdown/etools-dropdown';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import LocalizeMixin from '../../../etools-prp-common/mixins/localize-mixin';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {html, PolymerElement} from '@polymer/polymer';
import {property} from '@polymer/decorators';
import '@unicef-polymer/etools-dropdown/etools-dropdown';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import {GenericObject} from '../../../etools-prp-common/typings/globals.types';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {property} from '@polymer/decorators';
import FilterMixin from '../../../etools-prp-common/mixins/filter-mixin';
import {Debouncer} from '@polymer/polymer/lib/utils/debounce';
import {timeOut} from '@polymer/polymer/lib/utils/async';
import {fireEvent} from '../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import {PaperInputElement} from '@polymer/paper-input/paper-input';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
canSave
} from './js/pd-details-calculation-methods-functions';
import {RootState} from '../../typings/redux.types';
import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import LocalizeMixin from '../../etools-prp-common/mixins/localize-mixin';
import {EtoolsPrpAjaxEl} from '../../etools-prp-common/elements/etools-prp-ajax';
import {computeDocUrl} from './js/pd-details-doc-download-functions';
import {RootState} from '../../typings/redux.types';
import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
5 changes: 2 additions & 3 deletions frontend_ip/src_ts/elements/ip-reporting/pd-output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {EtoolsPrpAjaxEl} from '../../etools-prp-common/elements/etools-prp-ajax'
import '../../etools-prp-common/elements/etools-prp-permissions';
import '../../etools-prp-common/elements/indicator-details';
import {RootState} from '../../typings/redux.types';
import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand All @@ -41,8 +41,7 @@ import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
* @appliesMixin RoutingMixin
* @appliesMixin LocalizeMixin
*/
class PdOutput extends LocalizeMixin(RoutingMixin(ProgressReportUtilsMixin(UtilsMixin(ReduxConnectedElement)))
) {
class PdOutput extends LocalizeMixin(RoutingMixin(ProgressReportUtilsMixin(UtilsMixin(ReduxConnectedElement)))) {
public static get template() {
return html`
<style include="iron-flex iron-flex-factors">
Expand Down
4 changes: 2 additions & 2 deletions frontend_ip/src_ts/elements/ip-reporting/pd-report-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {timeOut} from '@polymer/polymer/lib/utils/async';
import {pdReportsUpdate} from '../../redux/actions/pdReports';
import {RootState} from '../../typings/redux.types';
import {formatServerErrorAsText} from '../../etools-prp-common/utils/error-parser';
import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down Expand Up @@ -527,7 +527,7 @@ class PdReportInfo extends ProgressReportUtilsMixin(LocalizeMixin(UtilsMixin(Red
if (data.id === this.localData.id) {
return data;
}

this.set('localData', {...data});
return data;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {computeListUrl, getDeleteUrl, setFiles} from './js/report-attachments-fu
import '@unicef-polymer/etools-file/etools-file';
// import {EtoolsFile} from '@unicef-polymer/etools-file/etools-file';
import {RootState} from '../../typings/redux.types';
import {fireEvent} from '../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
2 changes: 1 addition & 1 deletion frontend_ip/src_ts/elements/language-dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ReduxConnectedElement} from '../etools-prp-common/ReduxConnectedElement'
import {localizeSet} from '../redux/actions/localize';
import {DomRepeat} from '@polymer/polymer/lib/elements/dom-repeat';
import MatomoMixin from '@unicef-polymer/etools-piwik-analytics/matomo-mixin';
import {fireEvent} from '../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
2 changes: 1 addition & 1 deletion frontend_ip/src_ts/locales.ts
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ export const locales = {
unsatisfied: 'Unsatisfied',
neutral: 'Neutral',
satisfied: 'Satisfied',
very_satisfied: 'Very Satisfied',
very_satisfied: 'Very Satisfied'
},
fr: {
civil_society_organization: 'Civil Society Organization',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {timeOut} from '@polymer/polymer/lib/utils/async';
import {pdReportsUpdate} from '../../../../../redux/actions/pdReports';
import {RootState} from '../../../../../typings/redux.types';
import {PaperInputElement} from '@polymer/paper-input/paper-input';
import {fireEvent} from '../../../../../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';

/**
* @polymer
Expand Down
2 changes: 1 addition & 1 deletion frontend_ip/src_ts/pages/login-token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import '@polymer/iron-location/iron-location';
import '../etools-prp-common/elements/etools-prp-ajax';
import {EtoolsPrpAjaxEl} from '../etools-prp-common/elements/etools-prp-ajax';
import Endpoints from '../endpoints';
import {fireEvent} from '../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import {BASE_PATH} from '../etools-prp-common/config';

/**
Expand Down
2 changes: 1 addition & 1 deletion frontend_ip/src_ts/pages/unauthorized.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {EtoolsPrpAjaxEl} from '../etools-prp-common/elements/etools-prp-ajax';
import '../etools-prp-common/elements/message-box';
import '../etools-prp-common/elements/page-body';
import '../etools-prp-common/elements/user-profile/profile-dropdown';
import {fireEvent} from '../etools-prp-common/utils/fire-custom-event';
import {fireEvent} from '@unicef-polymer/etools-utils/dist/fire-event.util';
import {BASE_PATH} from '../etools-prp-common/config';
import {GenericObject} from '../etools-prp-common/typings/globals.types';

Expand Down