diff --git a/amp/.gitignore b/amp/.gitignore
index 589d9520628..10f20181949 100644
--- a/amp/.gitignore
+++ b/amp/.gitignore
@@ -10,3 +10,4 @@ lucene/
rebel.xml
/api-docs/
/derby.log
+**/.DS_Store
\ No newline at end of file
diff --git a/amp/Dockerfile b/amp/Dockerfile
index f68bb4747e3..35893d8151d 100644
--- a/amp/Dockerfile
+++ b/amp/Dockerfile
@@ -1,39 +1,128 @@
-FROM maven:3.8.4-jdk-8 as base
+FROM node:16.4.0 as node
+
+FROM node as compile-amp-state
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state
+COPY TEMPLATE/ampTemplate/node_modules/amp-state .
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci
+
+FROM node as compile-amp-translate
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate
+COPY TEMPLATE/ampTemplate/node_modules/amp-translate .
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci
+
+FROM node as compile-amp-boilerplate
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
+COPY TEMPLATE/ampTemplate/node_modules/amp-boilerplate .
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci \
+ && npm run build
+
+FROM node as compile-amp-filter
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
+COPY TEMPLATE/ampTemplate/node_modules/amp-filter .
+# HACK otherwise amp-filter won't compile!
+COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci \
+ && npm run build
+
+FROM node as compile-amp-settings
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
+COPY TEMPLATE/ampTemplate/node_modules/amp-settings .
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci \
+ && npm run build
+
+FROM node as compile-gis-layers-manager
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
+COPY TEMPLATE/ampTemplate/node_modules/gis-layers-manager .
+RUN --mount=type=cache,target=/root/.npm \
+ npm ci \
+ && npm run build
+
+FROM node as compile-gis-module
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/gisModule
+COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate
+COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate
+COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter
+# HACK otherwise amp-filter won't compile!
+COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log
+COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings
+COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager ../node_modules/gis-layers-manager
+COPY TEMPLATE/ampTemplate/gisModule .
+RUN --mount=type=cache,target=/root/.npm \
+ cd dev \
+ && npm ci \
+ && npm run test \
+ && npm run build \
+ && rm -rf node_modules
+
+FROM node as compile-dashboard
+WORKDIR /tmp/amp/TEMPLATE/ampTemplate/dashboard
+COPY --from=compile-amp-state /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-state ../node_modules/amp-state
+COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../node_modules/amp-translate
+COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../node_modules/amp-boilerplate
+COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../node_modules/amp-filter
+# HACK otherwise amp-filter won't compile!
+COPY TEMPLATE/reamp/tools/log /tmp/amp/TEMPLATE/reamp/tools/log
+COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../node_modules/amp-settings
+COPY TEMPLATE/ampTemplate/node_modules/amp-url ../node_modules/amp-url
+COPY TEMPLATE/ampTemplate/dashboard .
+RUN --mount=type=cache,target=/root/.npm \
+ cd dev \
+ && npm ci \
+ && npm run build \
+ && rm -rf node_modules
+
+FROM node as compile-reamp
+WORKDIR /tmp/amp/TEMPLATE/reamp
+COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate
+COPY TEMPLATE/reamp .
+RUN --mount=type=cache,target=/root/.npm \
+ --mount=type=ssh \
+ npm ci \
+ && npm run build \
+ && rm -rf node_modules
+
+FROM node as compile-reampv2
+WORKDIR /tmp/amp/TEMPLATE/reampv2
+COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate ../ampTemplate/node_modules/amp-boilerplate
+COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter ../ampTemplate/node_modules/amp-filter
+COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings ../ampTemplate/node_modules/amp-settings
+COPY TEMPLATE/reampv2 .
+RUN --mount=type=cache,target=/root/.npm \
+ --mount=type=ssh \
+ npm ci \
+ && npm run build \
+ && rm -rf node_modules
+
+FROM maven:3.8.4-jdk-8 as compile-mvn
WORKDIR /tmp/amp
COPY . .
-
-FROM base as compile
+COPY --from=compile-amp-boilerplate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist TEMPLATE/ampTemplate/node_modules/amp-boilerplate/dist
+COPY --from=compile-amp-filter /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/dist TEMPLATE/ampTemplate/node_modules/amp-filter/dist
+COPY --from=compile-amp-settings /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/dist TEMPLATE/ampTemplate/node_modules/amp-settings/dist
+COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist TEMPLATE/ampTemplate/node_modules/gis-layers-manager/dist
+COPY --from=compile-gis-module /tmp/amp/TEMPLATE/ampTemplate/gisModule/dist TEMPLATE/ampTemplate/gisModule/dist
+COPY --from=compile-dashboard /tmp/amp/TEMPLATE/ampTemplate/dashboard/build TEMPLATE/ampTemplate/dashboard/build
+COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp TEMPLATE/reamp
+COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/build
ARG BUILD_SOURCE
-RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh \
- --mount=type=cache,target=/root/.m2 \
- --mount=type=cache,target=/root/.npm \
+RUN --mount=type=cache,target=/root/.m2 \
mvn -B test war:exploded \
-DbuildSource=$BUILD_SOURCE \
-Djdbc.user=amp -Djdbc.password=amp122006 -Djdbc.db=amp -Djdbc.host=db \
-Djdbc.port=5432 -DdbName=postgresql -Djdbc.driverClassName=org.postgresql.Driver \
+ -Dskip.npm -Dskip.installnodenpm \
&& mv target/amp exploded \
- && rm -rf target \
- TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node \
- TEMPLATE/ampTemplate/node_modules/amp-boilerplate/node_modules \
- TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node \
- TEMPLATE/ampTemplate/node_modules/gis-layers-manager/node_modules \
- TEMPLATE/ampTemplate/node_modules/amp-settings/node \
- TEMPLATE/ampTemplate/node_modules/amp-settings/node_modules \
- TEMPLATE/ampTemplate/node_modules/amp-translate/node \
- TEMPLATE/ampTemplate/node_modules/amp-translate/node_modules \
- TEMPLATE/ampTemplate/node_modules/amp-state/node \
- TEMPLATE/ampTemplate/node_modules/amp-state/node_modules \
- TEMPLATE/ampTemplate/node_modules/amp-filter/node \
- TEMPLATE/ampTemplate/node_modules/amp-filter/node_modules \
- TEMPLATE/ampTemplate/gisModule/dev/node \
- TEMPLATE/ampTemplate/gisModule/dev/node_modules \
- TEMPLATE/ampTemplate/dashboard/dev/node \
- TEMPLATE/ampTemplate/dashboard/dev/node_modules \
- TEMPLATE/reamp/node \
- TEMPLATE/reamp/node_modules \
- TEMPLATE/reampv2/node \
- TEMPLATE/reampv2/node_modules
+ && rm -rf target
FROM tomcat:8.5.79-jdk8
@@ -62,4 +151,4 @@ LABEL "branch"=$AMP_BRANCH
ENV AMP_REGISTRY_PRIVATE_KEY $AMP_REGISTRY_PRIVATE_KEY
RUN rm -fr /usr/local/tomcat/webapps/ROOT
-COPY --from=compile /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/
+COPY --from=compile-mvn /tmp/amp/exploded /usr/local/tomcat/webapps/ROOT/
diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css
index 2a41230ab89..312b192ecd1 100644
--- a/amp/TEMPLATE/ampTemplate/css_2/amp.css
+++ b/amp/TEMPLATE/ampTemplate/css_2/amp.css
@@ -41,7 +41,7 @@ table.fixed-layout {table-layout:fixed; width: 100%;}
td select.inp-text-orgType{width:250px;}
td input#keyWordTextField{height:22px;}
table#addUserContainer tr td input {border:1px solid #D0D0D0; background-color:#FFFFFF;margin:0px 0px 0px 5px; width:150px;}
-table tr td.f-names{font-weight:bold;}
+table tr td.f-names{font-weight:700; font-size: 14px;}
.insidex{font-size:11px;color:#000000;padding:2px;margin:5px}
.dropdwn_sm {border:1px solid #D0D0D0; font-size:11px; background-color:#FFFFFF;}
.dropdwn_sm_wksp {border:1px solid #CCCCCC; font-size:11px; background-color:#FFFFFF; color:#000000;}
@@ -64,7 +64,7 @@ li.bullet {margin-left:14px;}
#exportDiv td.inside
{
- vertical-align: top;
+ vertical-align: top;
}
td.inside a img {border:0;}
@@ -338,9 +338,9 @@ html.chrome #show_login_pop_box{margin-top:44px;}
font-size: 11px;
margin-top: 25px;
padding-bottom: 10px;
- width:100%;
+ width:100%;
padding-top: 10px;
- text-align:center;
+ text-align:center;
}
.dialog {display:none;}
@@ -406,14 +406,16 @@ ul.first-of-type li.yui-gen14 {}
/*-----rafy-----*/
div.reg_form_container{width:1000px; margin:0 auto;text-align:center;}
div.reg_form_container table {margin:0 auto; }
-div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px;}
-div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;}
+/* timothymugo - add height of the input boxes */
+div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:30px;}
+div.reg_form_container .buttonx {background-color:#68b35b; font-size:14px; color:#FFFFFF; font-weight:bold; padding: 3px 5px; height:30px; width: 200px; margin-right: 421px; }
div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;}
div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;}
div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;}
span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;}
+span.formnote .login_warning_title{font-size: 16px; font-weight: 600; color: #225099FF;}
td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;}
-div.reg_form_container .f-names {color:#000000; font-size:12px;}
+div.reg_form_container .f-names {color: rgba(0, 0, 0, 0.6); font-size:12px;}
div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;}
#amphome{width:1000px; margin:0 auto;}
#amphomesidebar{width:220px; float:right;}
@@ -423,10 +425,10 @@ div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; wi
font-size: 11px;
margin: 5px;
padding: 2px;
- background-color: #FFFFFF;
+ background-color: #FFFFFF;
border: 1px solid #D0D0D0;}
#Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input
- { background-color: #5E8AD1;
+{ background-color: #5E8AD1;
border-color: #99BAF1 #225099 #225099 #99BAF1;
border-style: solid;
border-width: 1px;
@@ -457,14 +459,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu
font-weight: bold;
height: 25px;
padding: 3px 5px;}
- .ampFormContainer
- {width:1000px;
- margin:0 auto;
- text-align:left;}
- .formCheckContainer{text-align:right;font-weight:bold;}
+.ampFormContainer
+{width:1000px;
+ margin:0 auto;
+ text-align:left;}
+.formCheckContainer{text-align:right;font-weight:bold;}
.formCheckContainer input
- {float:right;}
- #auditloggertable{border:1px solid #cccccc;border-left:none;}
+{float:right;}
+#auditloggertable{border:1px solid #cccccc;border-left:none;}
#auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;}
#auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;}
#auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;}
@@ -507,39 +509,44 @@ div.adminicon{float:right;}
#breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;}
#breadcrumbs ul{float:left;}
#breadcrumbs ul li {
- display:inline;
- padding:0px;
- margin:0px;
- line-height:30px;
+ display:inline;
+ padding:0px;
+ margin:0px;
+ line-height:30px;
}
#breadcrumbs, #breadcrumbs li.yuimenuitem a {
- color: #376091;
- font-size: 10px;
- font-family:arial;
- padding:3px 10px 3px 0px;
- margin:0px;
- padding-top:0px;
- font-weight:bold;
- text-decoration:none;
- text-align: left;
- background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right;
+ color: #376091;
+ font-size: 10px;
+ font-family:arial;
+ padding:3px 10px 3px 0px;
+ margin:0px;
+ padding-top:0px;
+ font-weight:bold;
+ text-decoration:none;
+ text-align: left;
+ background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right;
}
#breadcrumbs .bd li.yuimenuitem a:hover {
- text-decoration:underline;
+ text-decoration:underline;
}
/*-----rafy-----*/
-div.reg_form_container{width:1000px; margin:0 auto;text-align:center;}
+div.reg_form_container{width:auto; text-align: left; margin-left: -50px;}
div.reg_form_container table {margin:0 auto; }
-div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #d0d0d0;height:18px; width:145px;}
-div.reg_form_container .buttonx {background-color:#5E8AD1; border-top: 1px solid #99BAF1; border-left:1px solid #99BAF1; border-right:1px solid #225099; border-bottom:1px solid #225099; font-size:11px; color:#FFFFFF; font-weight:bold; padding-left:5px; padding-right:5px; padding-top:3px; padding-bottom:3px; height:25px;}
+/* Modify the input boxes - timothymugo */
+div.reg_form_container input,div.reg_form_container form input, div.reg_form_container form select{border:1px solid #e6e9ed;height:32px; font-size: 12px; font-weight: 500; width: 280px; padding: 5px 20px; border-radius: 5px;}
+div.reg_form_container .buttonx {background-color:#68b35b; border-top: 1px solid #99BAF1; font-size:14px; color:#FFFFFF; font-weight: 700; padding: 3px 5px; height:30px;}
div.reg_form_container form input.dr-menu, div.reg_form_container input.dr-menu{ font-size:14px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin:10px;height:25px;border:1px solid #364d5a;}
div.reg_form_title{text-align:left;border-top:5px solid #4A687A; margin:0px 0px 20px 0px; background:#f0f0f0;padding:0px 0px 10px 0px;border-bottom:1px solid #ccccce;}
div.reg_form_container h2 { font-size:30px; font-weight:bold; color:#FFFFFF; background-color:#4A687A; margin-left:10px; padding:5px; letter-spacing:-1px; margin-right:10px;display:inline;}
-span.formnote{color:#595959; font-size:14px;font-weight:bold;line-height:20px;}
+span.formnote{color:#595959; font-size:14px;font-weight:500;line-height:20px;}
td.title{background-color:#f0f0f0;color:#999; font-size:12px;font-weight:bold;padding:10px;}
-div.reg_form_container .f-names {color:#000000; font-size:12px;}
+/* changed font-size */
+div.reg_form_container .f-names {color: #3e6280; font-size:14px; text-align: right; padding-right: 10px;}
+/* added input row container - tmugo */
+div.reg_form_container .input_row_container td { border-bottom: 1px solid #edeff1; padding: 8px;}
+div.reg_form_container .reg_submit_btn_container td { padding: 20px 18px; border-bottom: none;}
div.breadcrumbsplaceholder {height:25px; clear:both;margin:20px 0px 20px 0px; width:950px; background:#f0f0f0; color:#000;}
#amphome{width:1000px; margin:0 auto;}
#amphometext{width:740px; float:left;}
@@ -553,10 +560,10 @@ html.ie #amphomesidebar{width:200px;}
font-size: 11px;
margin: 5px;
padding: 2px;
- background-color: #FFFFFF;
+ background-color: #FFFFFF;
border: 1px solid #D0D0D0;}
#Tab_Name td#reportsearchform1 input, #Tab_Name td#reportsearchform2 input
- { background-color: #5E8AD1;
+{ background-color: #5E8AD1;
border-color: #99BAF1 #225099 #225099 #99BAF1;
border-style: solid;
border-width: 1px;
@@ -587,14 +594,14 @@ table#addUserContainer td.addUserButContainer input, td.addUserButContainer inpu
font-weight: bold;
height: 25px;
padding: 3px 5px;}
- .ampFormContainer
- {width:1000px;
- margin:0 auto;
- text-align:left;}
- .formCheckContainer{text-align:right;font-weight:bold;}
+.ampFormContainer
+{width:1000px;
+ margin:0 auto;
+ text-align:left;}
+.formCheckContainer{text-align:right;font-weight:bold;}
.formCheckContainer input
- {float:right;}
- #auditloggertable{border:1px solid #cccccc;border-left:none;}
+{float:right;}
+#auditloggertable{border:1px solid #cccccc;border-left:none;}
#auditloggertable tr td{border-bottom:1px solid #cccccc;border-left:1px solid #cccccc;padding:10px;}
#auditloggertable tr td.auditloggername{color:#376091;font-weight:bold;font-size:12px;}
#auditloggermanagercontainer{background:#f2f2f2; border:1px solid #cccccc;padding:10px;width:980px;margin:0 auto;}
@@ -637,25 +644,25 @@ div.adminicon{float:right;}
#breadcrumbs {width:1000px;padding:0px;height:30px;margin:0px 0px 0px 0px;margin:0 auto;position:relative;text-align:left;}
#breadcrumbs ul{float:left;}
#breadcrumbs ul li {
- display:inline;
- padding:0px;
- margin:0px;
- line-height:30px;
+ display:inline;
+ padding:0px;
+ margin:0px;
+ line-height:30px;
}
#breadcrumbs, #breadcrumbs li.yuimenuitem a {
- color: #376091;
- font-size: 10px;
- font-family:arial;
- padding:3px 10px 3px 0px;
- margin:0px;
- padding-top:0px;
- font-weight:bold;
- text-decoration:none;
- text-align: left;
- background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right;
+ color: #376091;
+ font-size: 10px;
+ font-family:arial;
+ padding:3px 10px 3px 0px;
+ margin:0px;
+ padding-top:0px;
+ font-weight:bold;
+ text-decoration:none;
+ text-align: left;
+ background:url(/TEMPLATE/ampTemplate/img_2/breadcrumbsep.gif) no-repeat right;
}
#breadcrumbs .bd li.yuimenuitem a:hover {
- text-decoration:underline;
+ text-decoration:underline;
}
.usr_menu_logged{position:absolute;top:0px;right:0px;}
@@ -702,8 +709,8 @@ div.adminicon{float:right;}
.admin_landing_page_tbl {margin-top:10px;}
.yui-panel {
border-collapse: separate;
- font-family:arial;
- table-layout:fixed;
+ font-family:arial;
+ table-layout:fixed;
}
/**-----IE FIXES-----**/
/*
@@ -714,11 +721,11 @@ html.ie .main_menu{height:25px;margin:0 auto;text-align:left;border:none;positio
html.chrome .login_nav{padding:0px;margin:0px;}
html.chrome .login_here {
- background-color: #65B457;
- width: 125px;
- height: 33px;
- text-align: center;
- margin-top:10px;
+ background-color: #65B457;
+ width: 125px;
+ height: 33px;
+ text-align: center;
+ margin-top:10px;
}
html.chrome .login_here:hover {
background-color: #B4EEAA;
@@ -728,13 +735,13 @@ html.chrome .login_here:hover {
html.ie li.yuiampmenuitem a {padding-top: 0px !important;}
html.ie #show_login_pop_box{ border:1px solid #cccccc;position:absolute;left:0px; top:15px;z-index:9999;}
html.ie .login_here {
- background-color: #65B457;
- width: 125px;
- height: 33px;
- text-align: center;
- position: absolute;
- top: 15px;
- left: 10px;
+ background-color: #65B457;
+ width: 125px;
+ height: 33px;
+ text-align: center;
+ position: absolute;
+ top: 15px;
+ left: 10px;
}
html.ie .login_here:hover {
background-color: #B4EEAA;
@@ -760,7 +767,7 @@ html.ie div.header{z-index:9999;}
#previewHeaderSectionDiv {background-color:#F5F5F5; text-align:center; padding-top:5px; padding-bottom:5px; border-top:1px solid #E9E9E9; border-bottom:1px solid #E9E9E9; font-size:11px; font-weight:bold; color:#5C5C5C;}
#previewHeaderSectionDiv span {font-size:11px; font-weight:bold; color:#5C5C5C; cursor: pointer;}
#components_dots table tr td {font-size:11px;}
-table tr td {font-size:11px;}
+table tr td {}
div.breadcrump_cont{display:none;}
.dgf_footer {margin-top:15px; margin-bottom:15px; text-align:center; font-size:11px; color:#8B8B8B; line-height:18px;}
@@ -801,15 +808,15 @@ h1.admintitle{font-size:16px;text-transform:none;color: #376091;padding:0px 0px
/*---rafy was here---*/
td.wrklist div.workspacelist{background: url(../images/arrow-014E86.gif) no-repeat center left #F2F2F2;
-padding: 3px 10px 3px 3px;
-margin-bottom: 1px;
-font-size: 12px;
-text-decoration: none;
-height: 20px;
-line-height: 20px;
-background-position: 5px 7px;
-text-indent: 20px;
-width:75%;
+ padding: 3px 10px 3px 3px;
+ margin-bottom: 1px;
+ font-size: 12px;
+ text-decoration: none;
+ height: 20px;
+ line-height: 20px;
+ background-position: 5px 7px;
+ text-indent: 20px;
+ width:75%;
}
td.wrklist div.workspacelist a{text-decoration:none; color:#737373;}
td.wrklist div.workspacelist a:hover{text-decoration:underline;color:#376091;}
@@ -834,20 +841,20 @@ html.ie div.innertabheader input.inputx{margin-top:5px;vertical-align:top;}
html.ie div.menucontainer{margin:0 auto;width:1000px;}
*/
.subtitle-blue {
-BORDER-RIGHT: 1px;
-BORDER-TOP: 1px;
-FONT-WEIGHT: bold;
-FONT-SIZE: 11pt;
-PADDING-BOTTOM: 10px;
-BORDER-LEFT: 1px;
-COLOR: #014e86;
-PADDING-TOP: 16px;
-BORDER-BOTTOM: 1px;
-LETTER-SPACING: 1px;
-border-right: 1px;
-border-top: 1px;
-border-left: 1px;
-border-bottom: 1px;}
+ BORDER-RIGHT: 1px;
+ BORDER-TOP: 1px;
+ FONT-WEIGHT: bold;
+ FONT-SIZE: 11pt;
+ PADDING-BOTTOM: 10px;
+ BORDER-LEFT: 1px;
+ COLOR: #014e86;
+ PADDING-TOP: 16px;
+ BORDER-BOTTOM: 1px;
+ LETTER-SPACING: 1px;
+ border-right: 1px;
+ border-top: 1px;
+ border-left: 1px;
+ border-bottom: 1px;}
legend.admtoolsttl{position:absolute;top:-10px;left:10px;}
#customDecimalSymbol{width:64px;}
span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5d5b;font-size:11px;font-weight:normal;}
@@ -877,155 +884,155 @@ span.geostyle{background:#f1f1f1;padding:3px;border:1px solid #e0e0e0;color:#5d5
.clear,.innerTab {
- clear: both;
+ clear: both;
}
div#filterContainer {
- width: 740px;
- min-height: 350px;
- margin: 0 auto;
- background: #fff;
+ width: 740px;
+ min-height: 350px;
+ margin: 0 auto;
+ background: #fff;
}
div.filterContainerHeader {
- background: #e9e9fb;
- border-bottom: 1px solid #bfd4e0;
- height: 26px;
+ background: #e9e9fb;
+ border-bottom: 1px solid #bfd4e0;
+ height: 26px;
}
div.filterContainerHeader h2 {
- line-height: 26px;
- font-size: 12px;
- font-weight: bold;
- text-indent: 11px;
- width: 90%;
- float: left;
+ line-height: 26px;
+ font-size: 12px;
+ font-weight: bold;
+ text-indent: 11px;
+ width: 90%;
+ float: left;
}
div.filterContainerTabs {
- width: 740px;
- margin: 0 auto;
- margin-top: 11px;
+ width: 740px;
+ margin: 0 auto;
+ margin-top: 11px;
}
div.groupingSelector {
- width: 311px;
- float: left;
- border-bottom: 1px solid #cccccc;
- border-right: none;
- height: 155px;
+ width: 311px;
+ float: left;
+ border-bottom: 1px solid #cccccc;
+ border-right: none;
+ height: 155px;
}
div.membersSelector {
- width: 425px;
- float: right;
- border-left: 1px solid #cccccc;
- border-right: 1px solid #cccccc;
- border-bottom: 1px solid #cccccc;
- height: 155px;
+ width: 425px;
+ float: right;
+ border-left: 1px solid #cccccc;
+ border-right: 1px solid #cccccc;
+ border-bottom: 1px solid #cccccc;
+ height: 155px;
}
div.innerTabHeader {
- border-bottom: 1px solid #cccccc;
- background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif);
- height: 31px;
+ border-bottom: 1px solid #cccccc;
+ background: url(/TEMPLATE/ampTemplate/img_2/ins_header.gif);
+ height: 31px;
}
div.innerTabHeader h3 {
- height: 31px;
- line-height: 31px;
- text-indent: 11px;
- float: left;
- font-size: 11px;
- color: #767676;
- margin: 0;
- padding: 0;
+ height: 31px;
+ line-height: 31px;
+ text-indent: 11px;
+ float: left;
+ font-size: 11px;
+ color: #767676;
+ margin: 0;
+ padding: 0;
}
div.membersSelector div.memsearch {
- padding: 1px 0px 0px 0px;
- width: 230px;
- float: right;
- text-align: right;
+ padding: 1px 0px 0px 0px;
+ width: 230px;
+ float: right;
+ text-align: right;
}
.innerTabHeader input.buttonx {
- font-size: 11px;
+ font-size: 11px;
}
.groupingSelector ul {
- margin: 0 auto;
- margin-bottom: 15px;
- width: 250px;
+ margin: 0 auto;
+ margin-bottom: 15px;
+ width: 250px;
}
.groupingSelector ul li {
- list-style: none;
+ list-style: none;
}
.groupingSelector ul li a {
- padding: 5px;
- font-size: 12px;
- display: block;
- background: #fff;
- color: #000;
- text-decoration: none;
+ padding: 5px;
+ font-size: 12px;
+ display: block;
+ background: #fff;
+ color: #000;
+ text-decoration: none;
}
.groupingSelector ul li a:hover {
- background: #bfd2df;
+ background: #bfd2df;
}
div.innerTab {
- height: 115px;
- overflow: auto;
- margin: 2px;
- width: 99%;
+ height: 115px;
+ overflow: auto;
+ margin: 2px;
+ width: 99%;
}
.otherCriteriaFoofet {
- padding: 15px 0px 0px 0px;
- clear: both;
+ padding: 15px 0px 0px 0px;
+ clear: both;
}
.otherCriteriaFoofet #calendarForm label {
- width: 100px;
- font-size: 11px;
- display: inline-block;
+ width: 100px;
+ font-size: 11px;
+ display: inline-block;
}
.otherCriteriaFoofet select {
- background-color: #FFFFFF;
- border: 1px solid #D0D0D0;
- color: #000;
- font-size: 11px;
- padding: 0px;
- width: 150px;
+ background-color: #FFFFFF;
+ border: 1px solid #D0D0D0;
+ color: #000;
+ font-size: 11px;
+ padding: 0px;
+ width: 150px;
}
.tabSubmit {
- text-align: center;
- padding: 0px 0px 5px 0px;
+ text-align: center;
+ padding: 0px 0px 5px 0px;
}
.groupingSelectors li a span {
- display: inline-block;
- float: right;
- font-size: 11px;
+ display: inline-block;
+ float: right;
+ font-size: 11px;
}
.groupingSelector, .groupingSelectors{
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
.advancedTranslations {border:1px solid #DBDBDB; padding:20px;}
.controlPanel {margin:0 !important; background-color:#EBEBEB; padding:5px;}
@@ -1040,57 +1047,57 @@ div.innerTab {
.tab_vis_link
{
- margin-bottom: 15px;
- margin-left: 15px;
- font-size: 1.15em;
- display: inline-block;
- padding: 3px;
+ margin-bottom: 15px;
+ margin-left: 15px;
+ font-size: 1.15em;
+ display: inline-block;
+ padding: 3px;
}
.tab_vis_link:hover
{
- border: 1px dashed gray;
- padding: 2px; /* swallow border's +1 paddings */
- background-color: #FFFFDD;
+ border: 1px dashed gray;
+ padding: 2px; /* swallow border's +1 paddings */
+ background-color: #FFFFDD;
}
.dashboards_left_container
{
- height: 210px;
- border: 1px solid #CCCCCC;
- overflow: auto;
- background: white;
- maxHeight: 210px;
- padding: 5px;
- padding-left: 20px;
+ height: 210px;
+ border: 1px solid #CCCCCC;
+ overflow: auto;
+ background: white;
+ maxHeight: 210px;
+ padding: 5px;
+ padding-left: 20px;
}
.dashboards_left_container ul.root_list {
- margin-left: 0px;
- padding-left: 0px;
- list-style-type: none;
+ margin-left: 0px;
+ padding-left: 0px;
+ list-style-type: none;
}
table.component-funding-table tr
{
- border-top: 1px solid black;
+ border-top: 1px solid black;
}
/* TABLE GLOBAL */
.tableEven {
- background-color:#EEF5F9;
- font-size:8pt;
- padding:2px;
+ background-color:#EEF5F9;
+ font-size:8pt;
+ padding:2px;
}
.tableOdd {
- background-color:#FFFFFF;
- font-size:8pt;!important
- padding:2px;
+ background-color:#FFFFFF;
+ font-size:8pt;!important
+padding:2px;
}
.Hovered {
- background-color:#a5bcf2;
+ background-color:#a5bcf2;
}
@@ -1104,21 +1111,21 @@ table.component-funding-table tr
.yui-skin-sam.smallish .yui-navset .yui-nav .selected a em
{
- padding: .17em .37em !important; /* smaller padding for tab headers */
+ padding: .17em .37em !important; /* smaller padding for tab headers */
}
.yui-skin-sam.smallish .yui-navset .yui-nav a em, .yui-skin-sam.smallish .yui-navset .yui-navset-top .yui-nav a em
{
- padding: .17em .37em !important; /* smaller padding for tab headers */
+ padding: .17em .37em !important; /* smaller padding for tab headers */
}
.yui-skin-sam.smallish input
{
- width: 85% !important;
- padding: 0.05em !important;
- margin: 0.4em 0.12em !important;
- border: 1px solid gray !important;
- border-radius: 4px !important;
+ width: 85% !important;
+ padding: 0.05em !important;
+ margin: 0.4em 0.12em !important;
+ border: 1px solid gray !important;
+ border-radius: 4px !important;
}
/*
@@ -1127,59 +1134,59 @@ table.component-funding-table tr
*/
.dataTable li{
- list-style-position: inside;
+ list-style-position: inside;
}
#actions-table {
- background-color: rgb(242, 242, 242);
- display: table;
- border-collapse: separate;
- border-spacing: 2px;
- border-color: gray;
- margin-bottom: 10px;
+ background-color: rgb(242, 242, 242);
+ display: table;
+ border-collapse: separate;
+ border-spacing: 2px;
+ border-color: gray;
+ margin-bottom: 10px;
}
.amp-table {
- display: table;
- border-collapse: separate;
- border-spacing: 2px;
- border-color: gray;
- margin-bottom: 10px;
- border-collapse: initial;
- border: 1px #cccccc solid;
- padding:1px;
+ display: table;
+ border-collapse: separate;
+ border-spacing: 2px;
+ border-color: gray;
+ margin-bottom: 10px;
+ border-collapse: initial;
+ border: 1px #cccccc solid;
+ padding:1px;
}
.workspace-table {
- display: table;
- border-collapse: separate;
- border-color: gray;
- margin-bottom: 10px;
- border-collapse: initial;
+ display: table;
+ border-collapse: separate;
+ border-color: gray;
+ margin-bottom: 10px;
+ border-collapse: initial;
}
.workspace-table td {
- border: 1px #cccccc solid;
- padding: 3px
+ border: 1px #cccccc solid;
+ padding: 3px
}
.workspace-table table td {
- border: 0px;
- padding: 3px
+ border: 0px;
+ padding: 3px
}
#TipLayer table {
- border: 1px rgb(128, 128, 128) solid;
+ border: 1px rgb(128, 128, 128) solid;
}
#TipLayer table td table:first-of-type {
- background-color: rgb(128, 128, 128);
+ background-color: rgb(128, 128, 128);
}
#TipLayer table td table:nth-of-type(2) {
- background-color: #F2F2F2;
+ background-color: #F2F2F2;
}
div.footer {
- margin-top:15px;
+ margin-top:15px;
}
.img-padding {
@@ -1188,37 +1195,37 @@ div.footer {
.label-column{
- text-align: right;
- width: 30%;
- padding: 5px;
+ text-align: right;
+ width: 30%;
+ padding: 5px;
}
.data-column{
- text-align: left;
- width: 70%;
+ text-align: left;
+ width: 70%;
}
.buttons-section{
- text-align: center;
+ text-align: center;
}
.button-section-padding {
- padding-top: 10px;
+ padding-top: 10px;
}
.org-type-fieldset {
- padding-left:200px;
- border:1px solid #CCCCCC;
- background-color:#FFFFFF;
- text-align: left;
+ padding-left:200px;
+ border:1px solid #CCCCCC;
+ background-color:#FFFFFF;
+ text-align: left;
}
.org-type-fieldset>input{
- margin: 4px;
+ margin: 4px;
}
-
+
.header-corner {
- background: url(../images/corner-r.gif) no-repeat;
+ background: url(../images/corner-r.gif) no-repeat;
}
.right_menu_empty {
@@ -1229,25 +1236,25 @@ div.footer {
color: #376091;
}
.frozen{
- width:15px;
- height:15px;
- background-color:red;
- float: left;
- margin-right:5px;
+ width:15px;
+ height:15px;
+ background-color:red;
+ float: left;
+ margin-right:5px;
}
.unfrozen{
- width:15px;
- height:15px;
- background-color:green;
- float: left;
- margin-right:5px;
+ width:15px;
+ height:15px;
+ background-color:green;
+ float: left;
+ margin-right:5px;
}
.legend-item {
- float:left;width:20%;
- margin-top:10px;
- clear:both;
+ float:left;width:20%;
+ margin-top:10px;
+ clear:both;
}
.summary-change-container {
@@ -1430,6 +1437,6 @@ div.footer {
}
.loading-spinner{
- display:block;
+ display:block;
margin:auto;
}
\ No newline at end of file
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html
index a055e066d7f..8b54ef0538e 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/index.html
@@ -6,10 +6,10 @@
Aid Management Platform - Dashboards
-
+
-
+
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js
index 17fcabe2bfb..a5c740f9c24 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-model-base.js
@@ -30,6 +30,11 @@ module.exports = BackboneDash.Model.extend({
// TODO adjtype hard-coding key for now, should get from settings...
data.settings = _({}).extend(data.settings, {'funding-type': this.get('adjtype')});
}
+
+ if (this.get('programType') && this.get('showProgramType') === true) {
+ data.settings = _({}).extend(data.settings, {'program-settings': this.get('programType')});
+ }
+
_.defaults(data.settings,{ 'currency-code': this.app.settingsWidget.definitions.getDefaultCurrencyId()});
options.data = JSON.stringify(data);
return BackboneDash.Model.prototype.fetch.call(this, options);
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js
index 5547338fb5f..d86de58af31 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/models/chart-tops.js
@@ -10,10 +10,11 @@ module.exports = ChartModel.extend({
limit: 5,
title: '',
bigN: 0,
- chartType: 'top'
+ chartType: 'top',
+ showProgramType: false
},
- _prepareTranslations: function() {
+ _prepareTranslations: function () {
var topBaseLanguage = {};
/* Prepare the translations for the chart */
@@ -29,28 +30,32 @@ module.exports = ChartModel.extend({
topBaseLanguage[chartName + 'others'] = 'Others';
this.localizedTopChart = this.app.translator.translateList(topBaseLanguage)
- .done(_(function(localizedTopChartKeyVal) {
+ .done(_(function (localizedTopChartKeyVal) {
this.localizedLookup = localizedTopChartKeyVal;
}).bind(this));
+
+ if (this.get('name') === 'Top Programs') {
+ this.set('showProgramType', true);
+ }
},
- parse: function(data) {
- this.set('title', data.title);
-
+ parse: function (data) {
+ this.set('title', data.title);
+
if (!this.localizedLookup) {
// we can't procede if we don't have translations yet :(
// this code should now be unreachable, but y'never know...
this.app.report('Loading error', [
- 'Translations for the application were not loaded before rendering']);
+ 'Translations for the application were not loaded before rendering']);
}
var chartName = ['amp.dashboard:chart-', this.get('name').replace(/ /g, ''), '-'].join('');
this.localizedOthers = this.localizedLookup[chartName + 'others'];
if (this.localizedOthers === undefined) {
- console.error('missing translation in .json file: ' + chartName + 'others');
+ console.error('missing translation in .json file: ' + chartName + 'others');
}
- var values = _(data.values.slice()).map(function(v) {
+ var values = _(data.values.slice()).map(function (v) {
var cleanName = v.name.replace(/[ :.]/g, '');
var localizedName = v.name;
if (this.localizedLookup[chartName + cleanName]) {
@@ -69,33 +74,33 @@ module.exports = ChartModel.extend({
if (_(_(values).pluck('x')).uniq().length < values.length) {
this.app.report('Data Error',
['The data for ' + this.get('name') + ' was inconsistent due to duplicate keys',
- 'The chart will be shown, but it may have errors or other issues as a result.']);
+ 'The chart will be shown, but it may have errors or other issues as a result.']);
}
- if (data.maxLimit > values.length) {
- var other = {
- x: this.localizedOthers,
- y: data.total - // total minus the sum of what we have
- _.chain(values).pluck('y').reduce(function(l, r) { return l + r; }, 0).value(),
- color: '#777',
- special: 'others'
- };
- //AMP-18740: We changed the EP to send raw numbers expressed in units so we need to apply the GS here.
- other.z = common.formatNumber(other.y / app.generalSettings.numberDivider);
-
- var isRtl = app.generalSettings.get("rtl-direction");
- if (isRtl) {
- values.unshift(other);
- } else {
- values.push(other);
- }
+ if (data.maxLimit > values.length) {
+ var other = {
+ x: this.localizedOthers,
+ y: data.total - // total minus the sum of what we have
+ _.chain(values).pluck('y').reduce(function (l, r) { return l + r; }, 0).value(),
+ color: '#777',
+ special: 'others'
+ };
+ //AMP-18740: We changed the EP to send raw numbers expressed in units so we need to apply the GS here.
+ other.z = common.formatNumber(other.y / app.generalSettings.numberDivider);
+
+ var isRtl = app.generalSettings.get("rtl-direction");
+ if (isRtl) {
+ values.unshift(other);
+ } else {
+ values.push(other);
+ }
}
- data.processed = [{values: values}];
+ data.processed = [{ values: values }];
return data;
},
- fetch: function(options) {
+ fetch: function (options) {
options = _.defaults(
options || {},
{ url: this.url + '?' + param(this.pick('limit')) });
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html
index 8eacfa31f90..4457582e053 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/chart.html
@@ -16,7 +16,7 @@ <%
<% } %>
-
+
@@ -66,16 +66,25 @@
- <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %>
-
- <% } %>
-
+ <% if (model.get('adjtype') && model.get('showMeasuresSelector') === true) { %>
+
+ <% } %>
+
+ <% if (model.get('programType') && model.get('showProgramType') === true) { %>
+
+ <% } %>
+
<% if (model.get('chartType') === 'fragmentation') { %>
-
\ No newline at end of file
+
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json
index cd00ac12de8..941801c090e 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/templates/initial-translation-request.json
@@ -149,5 +149,11 @@
"amp.dashboard:chart-tooltip-download-chart[title]":"Download image or table",
"amp.dashboard:chart-tooltip-expand-chart[title]":"Expand chart",
"amp.dashboard:chart-tooltip-collapse-chart[title]":"Collapse chart",
-"amp.dashboard:chart-tooltip-heatmap-chart[title]":"View heat map"
+"amp.dashboard:chart-tooltip-heatmap-chart[title]":"View heat map",
+"amp.dashboard:chart-TopPrograms": "Top Programs",
+"amp.dashboard:chart-TopPrograms-others": "Others",
+"amp.dashboard:prgscheme-national-plan-objective": "National Plan Objective",
+"amp.dashboard:prgscheme-primary-program": "Primary Program",
+"amp.dashboard:prgscheme-secondary-program": "Secondary Program",
+"amp.dashboard:prgscheme-tertiary-program": "Tertiary Program"
}
\ No newline at end of file
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js
index fdf3800aad0..e6713ea6968 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-tops.js
@@ -9,20 +9,21 @@ module.exports = ChartViewBase.extend({
uiDefaults: {
adjtype: 'FAKE',
+ programType: 'FAKE',
showTotal: true,
showMeasuresSelector: true,
showTopLegends: true,
- showCommonChartArea: true
+ showCommonChartArea: true
},
-
+
chartViews: [
'bar',
'pie',
- 'table'
+ 'table'
],
-
+
modalView: undefined,
-
+
//Dont try to call initialize here because it throws a 'Module initialization error' :((
/*initialize: function(options) {
this.modalView = new ModalView({ app: options.app, collection: this.model.collection });
@@ -36,7 +37,7 @@ module.exports = ChartViewBase.extend({
var ofTotal = app.translator.translateSync("amp.dashboard:of-total","of total");
var units = app.translator.translateSync(app.generalSettings.numberDividerDescription);
var self = this;
-
+
var currencyName = app.settingsWidget.definitions.findCurrencyById(self.model.get('currency')).value;
var ofTotal = app.translator.translateSync("amp.dashboard:of-total", "of total");
@@ -49,12 +50,12 @@ module.exports = ChartViewBase.extend({
}};
},
- chartClickHandler: function(context) {
+ chartClickHandler: function(context) {
// clicking on the "others" bar loads five more.
if (context.data[context.series.index]
.values[context.x.index].special === 'others') {
this.model.set('limit', this.model.get('limit') + 5);
- this.model.set('big', true);
+ this.model.set('big', true);
} else {
this.modalView = new ProjectsListModalView({ app: app, context: context, model: this.model });
this.openInfoWindow((context.x.fmt || context.x.raw));
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js
index ad8b8cd2351..d7685a3b0e5 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/chart-view-base.js
@@ -29,16 +29,17 @@ module.exports = BackboneDash.View.extend({
'click .download': 'download',
'click .expand': 'big',
'click .retry': 'render',
- 'click .heatmap-switch': 'heatmapSwitchAxis'
+ 'click .heatmap-switch': 'heatmapSwitchAxis',
+ 'change .dash-program-type select': 'changeProgramType',
},
chartViews: [
'bar',
'pie',
'heatmap',
- 'table'
- ],
-
+ 'table'
+ ],
+
initialize: function(options) {
this.app = options.app;
this.model.set(this.uiDefaults);
@@ -61,6 +62,7 @@ module.exports = BackboneDash.View.extend({
this.listenTo(this.model, 'change:xAxisColumn', this.render);
this.listenTo(this.model, 'change:limit', this.updateData);
this.listenTo(this.model, 'change:view', this.render);
+ this.listenTo(this.model, 'change:programType', this.render);
this.app.state.register(this, 'chart:' + this.model.url, {
get: _.partial(_(this.model.pick).bind(this.model), 'limit', 'adjtype', 'xAxisColumn', 'view', 'big','stacked','showPlannedDisbursements','showActualDisbursements','seriesToExclude', 'xLimit', 'yLimit', 'swapAxes'),
@@ -84,18 +86,18 @@ module.exports = BackboneDash.View.extend({
};
// We need to be sure all dependencies have been loaded before processing each chart (specially the templates).
$.when(this._stateWait, this.app.filter.loaded, this.app.translator.promise, this.app.settingsWidget.definitions.loaded, this.app.generalSettings.loaded).done(function() {
-
+
self.extractNumberFormatSettings();
self.$el.html(template(renderOptions));
self.hideExportInPublicView();
self.message = self.$('.dash-chart-diagnostic');
self.chartContainer = self.$('.dash-chart-wrap');
-
+
if (self.model.get('adjtype') !== void 0) { // this chart has adj settings
self.rendered = true;
- var adjSettings = self.app.settingsWidget.definitions.getFundingTypeSetting();
- if (!adjSettings) {
- self.app.report('Could not find Funding Type settings');
+ var adjSettings = self.app.settingsWidget.definitions.getFundingTypeSetting();
+ if (!adjSettings) {
+ self.app.report('Could not find Funding Type settings');
} else {
if (self.model.get('adjtype') === 'FAKE') {
self.model.set('adjtype', adjSettings.get('value').defaultId);
@@ -109,11 +111,35 @@ module.exports = BackboneDash.View.extend({
});
}, self)
);
-
+
} else {
self.rendered = true;
}
-
+
+ if (self.model.get('programType') !== void 0) { // this chart has programs type
+ self.rendered = true;
+ const pgrOptions = self.app.settingsWidget.definitions.getProgramSetting();
+
+ if (!pgrOptions) {
+ self.app.report('Could not find Program Type settings');
+ } else {
+ if (self.model.get('programType') === 'FAKE') {
+ self.model.set('programType', pgrOptions.get('value').defaultId);
+ }
+ }
+
+ self.$('.program-options').html(
+ _(pgrOptions.get('value').options).map(function(opt) {
+ return adjOptTemplate({
+ opt: opt,
+ current: (opt.id === self.model.get('programType'))
+ });
+ }, self)
+ );
+ } else {
+ self.rendered = true;
+ }
+
// For heatmaps add some extra combos.
if (self.model.get('chartType') === 'fragmentation') {
var heatMapConfigs = self.model.get('heatmap_config').models[0];
@@ -133,7 +159,7 @@ module.exports = BackboneDash.View.extend({
}, self)
);
}
-
+
if (self._stateWait.state() !== 'pending') {
self.updateData();
}
@@ -146,7 +172,7 @@ module.exports = BackboneDash.View.extend({
},
updateData: function() {
- if(this.app.rendered !== true) { return; }
+ if(this.app.rendered !== true) { return; }
if (!this.rendered) { return; } // short-circuit on early filters apply event
if (this._stateWait.state() === 'pending') { // short-circuit until we have state
this.message.html('Loading...').attr('data-i18n', 'amp.dashboard:chart-loading-saved-settings');
@@ -184,14 +210,14 @@ module.exports = BackboneDash.View.extend({
showChart: function() {
this.showNegativeAlert();
-
+
// TODO: why are we triggering twice on load???
if (!this.model.hasData()) {
this.message.html('No Data Available').attr('data-i18n','amp.dashboard:chart-no-data-available');
app.translator.translateDOM($('.chart-container'));
this.resetNumbers();
return;
- }
+ }
var chart = getChart(this.model.get('view'), this.model.get('processed'), this.getChartOptions(), this.model);
this.chartContainer.html(chart.el);
@@ -199,7 +225,7 @@ module.exports = BackboneDash.View.extend({
this.renderNumbers();
this.fixTitleWidth();
}
-
+
if (this.model.get('chartType') !== 'fragmentation') {
var limit = this.model.get('limit');
if (limit) {
@@ -213,13 +239,13 @@ module.exports = BackboneDash.View.extend({
}
}
this.message.stop().fadeOut(200);
-
+
this.beautifyLegends(this);
-
+
if (this.model.get('view') === 'heatmap') {
this.handleHeatmapClicks();
}
-
+
this.showChartPromise.resolve();
},
@@ -270,7 +296,7 @@ module.exports = BackboneDash.View.extend({
});
}
},
-
+
showNegativeAlert: function() {
if(this.model.get('view') === 'pie' && _.find(this.model.get('processed')[0].values, function(item) { return item.y < 0;})) {
this.$('.negative-values-message').show();
@@ -279,14 +305,14 @@ module.exports = BackboneDash.View.extend({
}
},
- getChartOptions: function() {
+ getChartOptions: function() {
var co = _(_(this.chartOptions).clone() || {}).defaults({
trimLabels: !this.model.get('big'),
getTTContent: this.getTTContent,
clickHandler: this.chartClickHandler,
width: this.$('.panel-body').width(),
height: this.$('.panel-body').height()
-
+
});
if(this.model.get('view') == 'multibar'){
co.stacked = this.model.get('stacked');
@@ -307,7 +333,7 @@ module.exports = BackboneDash.View.extend({
this.$('.chart-total').html(util.translateLanguage(this.model.get('sumarizedTotal'))); // this shall use the format from the server and translate it in the front end
}
var self = this;
- var currencyName = app.settingsWidget.definitions.findCurrencyById(self.model.get('currency')).value;
+ var currencyName = app.settingsWidget.definitions.findCurrencyById(self.model.get('currency')).value;
this.$('.chart-currency').html(currencyName);
},
@@ -315,7 +341,7 @@ module.exports = BackboneDash.View.extend({
this.$('.chart-total').html('');
this.$('.chart-currency').html('');
},
-
+
fixTitleWidth: function() {
var elementsSpace = 10;
var max_lines_on_title = 2;
@@ -333,7 +359,7 @@ module.exports = BackboneDash.View.extend({
}
}
},
-
+
calculateTextLines: function(object) {
var lineHeight = 24;
var lines = Math.floor($(object).height() / lineHeight);
@@ -353,11 +379,16 @@ module.exports = BackboneDash.View.extend({
var newType = e.currentTarget.value;
this.model.set('adjtype', newType);
},
-
+
+ changeProgramType: function(e) {
+ var newType = e.currentTarget.value;
+ this.model.set('programType', newType);
+ },
+
changeXAxis: function(e) {
var newType = e.currentTarget.value;
this.model.set('xAxisColumn', newType);
- },
+ },
changeChartView: function(e) {
var view = util.data(e.currentTarget, 'view');
@@ -370,8 +401,8 @@ module.exports = BackboneDash.View.extend({
this.$el.find('.download').hide();
}else{
this.$el.find('.download').show();
- }
- },
+ }
+ },
big: function() {
// toggle big/small charts on large screens
this.model.set('big', !this.model.get('big'));
@@ -381,8 +412,8 @@ module.exports = BackboneDash.View.extend({
this.$el[shouldBreak ? 'addClass' : 'removeClass']('clearfix');
},
- download: function() {
- var chartOptions = _(this.getChartOptions()).omit('height', 'width');
+ download: function() {
+ var chartOptions = _(this.getChartOptions()).omit('height', 'width');
var downloadView = new DownloadView({
app: this.app,
model: this.model,
@@ -394,22 +425,22 @@ module.exports = BackboneDash.View.extend({
specialClass: specialClass,
i18nTitle: 'amp.dashboard:download-download-chart'
});
-
- // Translate modal popup.
+
+ // Translate modal popup.
app.translator.translateDOM($("." + specialClass));
},
-
+
heatmapSwitchAxis: function () {
if (this.model.get('swapAxes') === true) {
this.model.set('swapAxes', false);
} else {
this.model.set('swapAxes', true);
- }
+ }
this.updateData();
},
//AMP-18630: Here we setup a simple tooltip for each legend element.
- beautifyLegends : function(self) {
+ beautifyLegends : function(self) {
var hasValues = false;
var hasProcessed = false;
if(self.model !== undefined && self.model.get('values') !== undefined && self.model.get('values').length > 0) {
@@ -418,7 +449,7 @@ module.exports = BackboneDash.View.extend({
if(self.model !== undefined && self.model.get('processed') !== undefined && self.model.get('processed').length > 1) {
hasProcessed = true;
}
-
+
// Iterate the list of legend elements in DOM (only for this chart) and set a data element called 'data-title' that
// will be then used when a hover event is fired.
$(this.$el).find(".nv-series").each(function(i, elem) {
@@ -440,12 +471,12 @@ module.exports = BackboneDash.View.extend({
}
}
}
-
+
// Now bind NV tooltip mechanism to hover event for each legend.
self.addSimpleTooltip(elem);
});
},
-
+
addSimpleTooltip: function(object) {
if ($(object).data('data-title') || $(object).data('title')) {
$(object).hover(function() {
@@ -458,21 +489,21 @@ module.exports = BackboneDash.View.extend({
}
},
extractNumberFormatSettings: function(settings) {
- var numberFormat = {};
+ var numberFormat = {};
numberFormat.numberFormat = this.app.generalSettings.get('number-format') || '#,#.#';
- // If the format pattern doesnt have thousands grouping then ignore 'number-group-separator' param or it will
+ // If the format pattern doesnt have thousands grouping then ignore 'number-group-separator' param or it will
// be used by JS to group by thousands (ie: in the 'Others' columns).
- if(numberFormat.numberFormat.indexOf(',') !== -1) {
+ if(numberFormat.numberFormat.indexOf(',') !== -1) {
numberFormat.groupSeparator = this.app.generalSettings.get('number-group-separator') || ',';
} else {
numberFormat.groupSeparator = '';
}
-
+
numberFormat.decimalSeparator = this.app.generalSettings.get('number-decimal-separator') || '.';
- this.app.generalSettings.numberFormatSettings = numberFormat;
-
- this.app.generalSettings.numberDivider = this.app.generalSettings.get('number-divider');
+ this.app.generalSettings.numberFormatSettings = numberFormat;
+
+ this.app.generalSettings.numberDivider = this.app.generalSettings.get('number-divider');
if (this.app.generalSettings.numberDivider === 1) {
this.app.generalSettings.numberDividerDescription = 'amp.dashboard:chart-tops-inunits';
} else if(this.app.generalSettings.numberDivider === 1000) {
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js
index 82d163fc32b..bade81a851c 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/app/js/app/views/main.js
@@ -35,6 +35,7 @@ var NDD = '/Dashboards[true]/Peace-building and State-building Goals[true]';
var SEC = '/Dashboards[true]/Sector Fragmentation[true]';
var LOC = '/Dashboards[true]/Location Fragmentation[true]';
var PRG = '/Dashboards[true]/Program Fragmentation[true]';
+var PR = '/Dashboards[true]/Top Programs[true]';
module.exports = BackboneDash.View.extend({
@@ -89,6 +90,15 @@ module.exports = BackboneDash.View.extend({
{name: 'Top Sectors', big: false, view: 'bar'},
{app: this.app, url: '/rest/dashboard/tops/ps'}));
}
+
+ if (_.find(enabledCharts, function (item) {
+ return item === PR;
+ })) {
+ col.push(new TopsChart(
+ {name: 'Top Programs', big: false, view: 'bar'},
+ {app: this.app, url: '/rest/dashboard/tops/pr'}));
+ }
+
if (_.find(enabledCharts, function (item) {
return item === AP;
})) {
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json
index a7a6b9fc0b8..bd121a4aa34 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/package.json
@@ -5,7 +5,9 @@
"repository": "git://github.com/uniphil/amp-svn",
"main": "gulpfile.js",
"scripts": {
- "test": "echo 'Testing not yet configured...'"
+ "test": "echo 'Testing not yet configured...'",
+ "build": "gulp build",
+ "dev": "gulp dev"
},
"license": "TODO: what is the license for AMP?",
"devDependencies": {
diff --git a/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md b/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md
index 7c20fcdcd6a..ccd79187d95 100644
--- a/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md
+++ b/amp/TEMPLATE/ampTemplate/dashboard/dev/readme.md
@@ -30,15 +30,35 @@ $ npm install
Development
-----------
-Build everything, run a development server with livereload, with one easy command:
+Build everything, run a development server with livereload, with the following steps:
+Replace the following line in `app/index.html` with the following:
+
+```html
+
+```
+
+
+
+with the following:
+
+```html
+
```
-$ gulp dev
-````
+
+
+
+Then run the following command:
+
+```bash
+gulp dev
+```
+
+Ensure that the tomcat server has started on [`localhost:8080`](http://localhost:8080)
You can access the dashboards now at
-[`localhost:3000/TEMPLATE/ampTemplate/dashboard/dev/app/index.html`](http://localhost:3000/TEMPLATE/ampTemplate/dashboard/dev/app/index.html)
+[`http://localhost:8080/TEMPLATE/ampTemplate/dashboard/dev/app/index.html`](http://localhost:8080/TEMPLATE/ampTemplate/dashboard/dev/app/index.html)
Testing
diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js b/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js
index a5423b60822..49cb7f4b4a7 100644
--- a/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js
+++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/gulpfile.js
@@ -41,6 +41,8 @@ var watchify = require('watchify');
var gulp = require('gulp');
var g = require('gulp-load-plugins')();
var connect = require('gulp-connect');
+var log = require('fancy-log');
+
const { createProxyMiddleware } = require('http-proxy-middleware');
var gulpi18nScraper = require('gulp-i18n-scraper');
var gulpUtil = require('gulp-util');
@@ -110,14 +112,12 @@ function _bundlify(ifyer, entry, destFolder, destName) {
var rebundle = function() {
g.util.log('rebrowserifying ' + entry + '....');
- return bundler.bundle({debug: true})
- /* Fix sourcemaps in firefox (not in amp-filters though)though https://github.com/substack/node-browserify/issues/681#issuecomment-39530724 */
- .pipe(mold.transformSourcesRelativeTo(__dirname))
- .on('error', function(e) { g.util.log('Browserify error: ', e); })
- .pipe(source(destName))
- .pipe(gulp.dest(destFolder));
+ return bundler.bundle()
+ .on('end', function() { log('bundle: finished'); })
+ .on('error', function(e) { log('bundle: error: ', e); })
+ .pipe(source(destName))
+ .pipe(gulp.dest(destFolder));
};
-
bundler.on('update', rebundle);
return rebundle();
diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json
index eb83d6679ce..762d2d88e51 100644
--- a/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json
+++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/package.json
@@ -5,11 +5,13 @@
"repository": "git://github.com/uniphil/amp",
"main": "gulpfile.js",
"scripts": {
- "test": "echo 'Testing not yet configured...'"
+ "test": "gulp test",
+ "build": "gulp build"
},
"license": "TODO: what is the license for AMP?",
"browserify": {
"transform": [
+ "brfs",
"browserify-shim"
]
},
@@ -49,9 +51,9 @@
"@babel/polyfill": "^7.2.5",
"backbone": "1.1.2",
"bootstrap": "3.3.0",
- "brfs": "1.2.0",
- "browserify": "4.2.3",
- "browserify-shim": "3.6.0",
+ "brfs": "^1.2.0",
+ "browserify": "^5.12.0",
+ "browserify-shim": "3.8.12",
"cheerio": "0.18.0",
"css-element-queries": "1.0.0",
"d3-browserify": "3.4.12",
diff --git a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp
index c99fc7081a6..feb11485f3b 100644
--- a/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp
+++ b/amp/TEMPLATE/ampTemplate/layout/loginWidget3.jsp
@@ -94,7 +94,7 @@
Click here to change your password
-
+
Change Password
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json
index 6fdaf61fc03..bdf0e7871d5 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/package.json
@@ -9,6 +9,9 @@
"brfs"
]
},
+ "scripts": {
+ "build": "gulp build"
+ },
"devDependencies": {
"backbone": "1.1.2",
"bootstrap": "3.4.1",
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css
index 3458173bbfc..cebc4dcfd02 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/css/main.css
@@ -183,6 +183,8 @@
div#amp-header div#logincontainer {
padding-left: 140px; /* IE9 fix that works everywhere: make room for green login button */
+ height: 100%;
+ margin-top: 1.9%;
}
div#amp-header .login_here {
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html
index 8d0a17dcc60..dfc96ed4326 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate/src/templates/footer-template.html
@@ -77,8 +77,7 @@
var u="<%= properties.trackingUrl %>";
_paq.push(["setTrackerUrl", u+"piwik.php"]);
_paq.push(["setSiteId", "<%=properties.siteId %>"]);
- var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
- g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+ var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g,s);
})();
}
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json
index 736808f0a7b..f1d35a53b08 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/package.json
@@ -4,7 +4,8 @@
"description": "Filters to be used across many AMP modules (gis, etc)",
"main": "dist/amp-filter.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "gulp build"
},
"browserify": {
"transform": [
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js
index 013c7d14358..acb8b58aeab 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/utils/constants.js
@@ -44,6 +44,7 @@ var constants = {
YEAR_SINGLE_VALUE: 'YEAR-SINGLE-VALUE',
CONTEXT_DASHBOARD: 'DASHBOARD',
CONTEXT_GIS: 'GIS',
+ CONTEXT_REPORT: 'REPORTS',
FUNDING_ORGANIZATIONS: 'Funding Organizations',
ACTIVITY: 'Activity',
ALL_AGENCIES: 'All Agencies',
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js
index 939769e2356..dc3146cbbdc 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-filter/src/views/filters-view.js
@@ -579,8 +579,10 @@ module.exports = Backbone.View.extend({
return DateUtils.extractDates(self.settings, blob, 'dashboard-default-min-date', 'dashboard-default-max-date');
} else if (self.caller === Constants.CONTEXT_GIS) {
return DateUtils.extractDates(self.settings, blob, 'gis-default-min-date', 'gis-default-max-date');
+ } else if (self.caller === Constants.CONTEXT_REPORT) {
+ return DateUtils.extractDates(self.settings, blob, 'report-default-min-date', 'report-default-max-date');
}
- return blob
+ return blob;
},
cancel: function () {
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json
index b0a336ffdc7..f09cd87b904 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/package.json
@@ -4,7 +4,8 @@
"description": "Settings",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "gulp build"
},
"author": "",
"license": "ISC",
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js
index faa3def1963..5f02ad53c46 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/collections/settings-definitions-collection.js
@@ -48,6 +48,9 @@ module.exports = Backbone.Collection.extend({
findFundingTypeById: function(id){
return _.find(this.get(Constants.FUNDING_TYPE_ID).get('value').options, function(option){ return option.id === id });
},
+ findProgramSettingById: function(id){
+ return _.find(this.get(Constants.PROGRAM_SETTINGS).get('value').options, function(option){ return option.id === id });
+ },
getCurrencySetting: function(){
return this.get(Constants.CURRENCY_ID);
},
@@ -60,6 +63,9 @@ module.exports = Backbone.Collection.extend({
getFundingTypeSetting:function(){
return this.get(Constants.FUNDING_TYPE_ID);
},
+ getProgramSetting: function(){
+ return this.get(Constants.PROGRAM_SETTINGS);
+ },
getDefaultCurrencyId: function(){
return this.getCurrencySetting().get('value').defaultId;
},
@@ -72,6 +78,9 @@ module.exports = Backbone.Collection.extend({
getDefaultFundingTypeById: function(){
return this.getFundingTypeSetting().get('value').defaultId;
},
+ getDefaultProgramSettingId: function(){
+ return this.getProgramSetting().get('value').defaultId;
+ },
getSelectedOrDefaultCurrencyId : function() {
return this.app.toAPIFormat()[Constants.CURRENCY_ID] || this.getDefaultCurrencyId();
},
@@ -80,6 +89,9 @@ module.exports = Backbone.Collection.extend({
},
getSelectedOrDefaultFundingTypeId : function() {
return this.app.toAPIFormat()[Constants.FUNDING_TYPE_ID] || this.getDefaultFundingTypeById();
+ },
+ getSelectedProgramSettingId : function() {
+ return this.app.toAPIFormat()[Constants.PROGRAM_SETTINGS];
}
});
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js
index 77079fbb40c..1751db75cfe 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-settings/src/common/constants.js
@@ -15,5 +15,6 @@ module.exports = {
DASHBOARDS : 'DASHBOARDS',
REPORTS : 'REPORTS',
TABS : 'TABS'
- }
+ },
+ PROGRAM_SETTINGS : 'program-settings'
}
\ No newline at end of file
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js b/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js
index b5e6de87ebe..8186b587b1a 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js
+++ b/amp/TEMPLATE/ampTemplate/node_modules/amp-state/index.js
@@ -87,13 +87,15 @@ _.extend(State.prototype, Backbone.Events, {
loadById: function(id, matchedPrefix) {
this.loadPromise = this.saved.load(id, matchedPrefix );// TODO: drs: and pass matching prefix..
- this.loadPromise
- .done(_(function(stateModel) {
- this.load(stateModel.get('stateBlob'));
- }).bind(this))
- .fail(function() {
- throw new StateLoadError('Could not load state by id: ' + id);
- });
+ if (this.loadPromise) {
+ this.loadPromise
+ .done(_(function (stateModel) {
+ this.load(stateModel.get('stateBlob'));
+ }).bind(this))
+ .fail(function () {
+ throw new StateLoadError('Could not load state by id: ' + id);
+ });
+ }
},
load: function(statesBlob) {
diff --git a/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json b/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json
index 5c16792979d..632aa686086 100644
--- a/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json
+++ b/amp/TEMPLATE/ampTemplate/node_modules/gis-layers-manager/package.json
@@ -4,7 +4,8 @@
"description": "GIS Layer Manager",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "build": "gulp build"
},
"author": "",
"license": "ISC",
diff --git a/amp/TEMPLATE/ampTemplate/site-config.xml b/amp/TEMPLATE/ampTemplate/site-config.xml
index a803ff0f80b..2b15ee60964 100644
--- a/amp/TEMPLATE/ampTemplate/site-config.xml
+++ b/amp/TEMPLATE/ampTemplate/site-config.xml
@@ -1,7 +1,7 @@
-
+
]>
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
index e44289e3474..3172088c60f 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
@@ -20,7 +20,8 @@ import {
ACTIVITY_FORM_URL_SSC,
REGIONAL_FUNDINGS,
WORKSPACE_TYPE_MANAGEMENT,
- WORKSPACE_TYPE
+ WORKSPACE_TYPE,
+ MULTILINGUAL
} from '../common/ReampConstants.jsx';
import DateUtils from '../utils/DateUtils.jsx';
import HydratorHelper from '../utils/HydratorHelper.jsx';
@@ -30,8 +31,8 @@ import {
WorkspaceConstants
} from "amp-ui";
import processPossibleValues from '../common/PossibleValuesHelper.jsx';
-import Logger from '../utils/LoggerManager' ;
-import ActivityFundingTotals from '../utils/ActivityFundingTotals.jsx'
+import Logger from '../utils/LoggerManager';
+import ActivityFundingTotals from '../utils/ActivityFundingTotals.jsx';
import translate from '../utils/translate.jsx';
import * as ContactAction from './ContactsAction.jsx';
import * as ResourceAction from './ResourceAction.jsx';
@@ -45,87 +46,102 @@ export const ACTIVITY_WS_INFO_LOADING = 'ACTIVITY_WS_INFO_LOADING';
export const ACTIVITY_WS_INFO_LOADED = 'ACTIVITY_WS_INFO_LOADED';
export const ACTIVITY_WS_INFO_FAILED = 'ACTIVITY_WS_INFO_FAILED';
+export const FM_SETTINGS = 'fm-settings';
+export const REPORTING = 'REPORTING';
+export const ACTIVITY_PREVIEW = 'Activity Preview';
+
export function loadActivityForActivityPreview(activityId) {
return (dispatch, ownProps) => {
dispatch(sendingRequest());
const paths = [...FieldPathConstants.ADJUSTMENT_TYPE_PATHS];
- const {settings} = ownProps().startUpReducer;
- ActivityApi.fetchActivityInfo(activityId).then(activityInfo => {
- Promise.all([ActivityApi.getActivity(activityId),
- ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]),
- ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))]
- ).then(([activity, fieldsDef, fmTree]) => {
- const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC;
- _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC);
- if (settings[TEAM_ID]) {
- ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps);
- loadWsInfoForActivity(activity, dispatch);
- }
- ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps);
- //TODO find a better way to filter out non enabled paths
- const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [],
- settings.language, Logger);
- const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path));
- Promise.all([ActivityApi.fetchPossibleValues(enabledPaths),
+ const { settings } = ownProps().startUpReducer;
+
+ ActivityApi.fetchActivityInfo(activityId)
+ .then((activityInfo) => {
+ Promise.all([
+ ActivityApi.getActivity(activityId, settings.language),
+ ActivityApi.getFieldsDefinition(activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID]),
+ ActivityApi.fetchFmConfiguration(FmManagerHelper.getRequestFmSyncUpBody(Object.values(FeatureManagerConstants)))]
+ ).then(([activity, fieldsDef, fmTree]) => {
+ const isSSC = activity[ActivityConstants.ACTIVITY_TYPE] === ActivityConstants.ACTIVITY_TYPE_SSC;
+ _registerSettings(settings.language, settings['default-date-format'].toUpperCase(), isSSC);
+ if (settings[TEAM_ID]) {
+ ContactAction.loadHydratedContactsForActivity(activity)(dispatch, ownProps);
+ loadWsInfoForActivity(activity, dispatch);
+ }
+ ResourceAction.loadResourcesForActivity(activity)(dispatch, ownProps);
+ //TODO find a better way to filter out non enabled paths
+ const activityFieldsManagerTemp = new FieldsManager(fieldsDef, [],
+ settings.language, Logger, null, settings[MULTILINGUAL]);
+ const enabledPaths = paths.filter(path => activityFieldsManagerTemp.isFieldPathEnabled(path));
+ Promise.all([ActivityApi.fetchPossibleValues(enabledPaths),
ActivityApi.fetchFundingInformation(activityId, settings[Constants.EFFECTIVE_CURRENCY].id)])
- .then(([possibleValuesCollectionAPI, activityFundingInformation]) => {
- const activityFieldsManager = new FieldsManager(fieldsDef,
- processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger);
- _populateFMTree(fmTree);
- _configureNumberUtils(settings);
-
- ActivityApi.fetchValuesForHydration(HydratorHelper.fetchRequestDataForHydration(activity,
- activityFieldsManager, ''),
- activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID])
- .then(valuesForHydration => {
- HydratorHelper.hydrateObject(activity, activityFieldsManager, '',
- null, valuesForHydration);
- activity.id = String(activity.internal_id);
- _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp);
- // we create an empty currency rates manager since we will be converting from same currencies,
- // it wont be used it will just return 1.
- const currencyRatesManager = new CurrencyRatesManager([],
- activityFundingInformation.currency, translate, DateUtils, {});
- return dispatch({
- type: ACTIVITY_LOAD_LOADED,
- payload: {
- activity: activity,
- activityFieldsManager,
- activityContext: _getActivityContext(settings, activityInfo, activity),
- activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation),
- currencyRatesManager
+ .then(([possibleValuesCollectionAPI, activityFundingInformation]) => {
+ //TODO: check why prefix is null
+ const activityFieldsManager = new FieldsManager(fieldsDef,
+ processPossibleValues(possibleValuesCollectionAPI), settings.language, Logger, null, settings[MULTILINGUAL]);
+ _populateFMTree(fmTree);
+ _configureNumberUtils(settings);
+
+ let fieldsToHydrate = HydratorHelper.fetchRequestDataForHydration(activity, activityFieldsManager, '');
+
+ ActivityApi.fetchValuesForHydration(fieldsToHydrate, activityInfo.activityWorkspace[WorkspaceConstants.TEMPLATE_ID])
+ .then(valuesForHydration => {
+ HydratorHelper.hydrateObject(activity, activityFieldsManager, '',
+ null, valuesForHydration);
+ activity.id = String(activity.internal_id);
+ _convertCurrency(activity, activityFundingInformation, activityFieldsManagerTemp);
+ // we create an empty currency rates manager since we will be converting from same currencies,
+ // it wont be used it will just return 1.
+ const currencyRatesManager = new CurrencyRatesManager([],
+ activityFundingInformation.currency, translate, DateUtils, {});
+ var reportingTotalVisibilty = {};
+ if (fmTree.hasOwnProperty(FM_SETTINGS) && fmTree[FM_SETTINGS].hasOwnProperty(REPORTING) &&
+ fmTree[FM_SETTINGS][REPORTING].hasOwnProperty(ACTIVITY_PREVIEW)){
+ reportingTotalVisibilty = fmTree[FM_SETTINGS][REPORTING][ACTIVITY_PREVIEW]
}
+ return dispatch({
+ type: ACTIVITY_LOAD_LOADED,
+ payload: {
+ activity: activity,
+ activityFieldsManager,
+ activityContext: _getActivityContext(settings, activityInfo, activity),
+ activityFundingTotals: new ActivityFundingTotals(activity, activityFundingInformation),
+ currencyRatesManager,
+ reportingTotals: reportingTotalVisibilty,
+ }
+ });
});
+ }).catch(error => {
+ return dispatch({
+ type: ACTIVITY_LOAD_FAILED,
+ payload: {
+ error: error
+ }
});
- }).catch(error => {
- return dispatch({
- type: ACTIVITY_LOAD_FAILED,
- payload: {
- error: error
- }
- });
- }); //TODO catch errors
- }).catch(error => {
+ });
+ });
+ })
+ .catch((error) => {
return dispatch({
type: ACTIVITY_LOAD_FAILED,
payload: {
- error: error
+ error
}
});
});
- });
};
function _registerSettings(lang, pGSDateFormat, isSSC) {
- const projectEditLink = {url: ACTIVITY_FORM_URL, isExternal: true};
- const editSscLink = {url: ACTIVITY_FORM_URL_SSC, isExternal: true};
+ const projectEditLink = { url: ACTIVITY_FORM_URL, isExternal: true };
+ const editSscLink = { url: ACTIVITY_FORM_URL_SSC, isExternal: true };
const editLink = isSSC ? editSscLink : projectEditLink;
- const viewLink = {url: ACTIVITY_PREVIEW_URL, isExternal: true};
- const versionHistoryLink = {url: VERSION_HISTORY_URL, isExternal: true};
- const compareActivityLink = {url: COMPARE_ACTIVITY_URL, isExternal: true};
- ActivityLinks.registerLinks({editLink, versionHistoryLink, compareActivityLink, viewLink});
- DateUtils.registerSettings({lang, pGSDateFormat});
+ const viewLink = { url: ACTIVITY_PREVIEW_URL, isExternal: true };
+ const versionHistoryLink = { url: VERSION_HISTORY_URL, isExternal: true };
+ const compareActivityLink = { url: COMPARE_ACTIVITY_URL, isExternal: true };
+ ActivityLinks.registerLinks({ editLink, versionHistoryLink, compareActivityLink, viewLink });
+ DateUtils.registerSettings({ lang, pGSDateFormat });
}
function sendingRequest() {
@@ -158,10 +174,12 @@ export function loadActivityForActivityPreview(activityId) {
const fundings = activity[ActivityConstants.FUNDINGS];
if (activity[ActivityConstants.PPC_AMOUNT] && activityFundingInformation[ActivityConstants.PPC_AMOUNT]) {
activity[ActivityConstants.PPC_AMOUNT].amount = activityFundingInformation[ActivityConstants.PPC_AMOUNT];
- activity[ActivityConstants.PPC_AMOUNT].currency.value = currencyCode;
+ if (activity[ActivityConstants.PPC_AMOUNT].currency !== undefined) {
+ activity[ActivityConstants.PPC_AMOUNT].currency.value = currencyCode;
+ }
}
const transactions = [...FieldPathConstants.TRANSACTION_TYPES,
- ActivityConstants.ESTIMATED_DISBURSEMENTS, ActivityConstants.MTEF_PROJECTIONS];
+ ActivityConstants.ESTIMATED_DISBURSEMENTS, ActivityConstants.MTEF_PROJECTIONS];
if (fundings) {
fundings.forEach(funding => {
const fundingFromConverted =
@@ -179,23 +197,23 @@ export function loadActivityForActivityPreview(activityId) {
transactionListInWsCurrency.find(tiwc => tiwc[TRANSACTION_ID] === t[TRANSACTION_ID]);
t[ActivityConstants.TRANSACTION_AMOUNT] = transactionInWsCurrency[ActivityConstants.TRANSACTION_AMOUNT];
// TODO convert the whole curreny not only the code
- t[ActivityConstants.CURRENCY].value = currencyCode;
- })
+ t[ActivityConstants.CURRENCY] = currencyCode; // change a number to the string code of the currency
+ });
}
});
}
});
}
- REGIONAL_FUNDINGS.forEach(rf => {
- if(activityFieldsManager.isFieldPathEnabled(rf)) {
- activity[rf].forEach(regionalFundingItem => {
- const convertedAmount = activityFundingInformation[rf].find(arf => arf.id === regionalFundingItem.id);
- regionalFundingItem.transaction_amount = convertedAmount.transaction_amount;
- // TODO convert the whole curreny not only the code
- regionalFundingItem[ActivityConstants.CURRENCY].value = convertedAmount.currency.currencyCode;
- })
- }
+ REGIONAL_FUNDINGS.forEach(rf => {
+ if (activityFieldsManager.isFieldPathEnabled(rf)) {
+ activity[rf].forEach(regionalFundingItem => {
+ const convertedAmount = activityFundingInformation[rf].find(arf => arf.id === regionalFundingItem.id);
+ regionalFundingItem.transaction_amount = convertedAmount.transaction_amount;
+ // TODO convert the whole curreny not only the code
+ regionalFundingItem[ActivityConstants.CURRENCY].value = convertedAmount.currency.currencyCode;
+ });
+ }
});
}
@@ -204,7 +222,7 @@ export function loadActivityForActivityPreview(activityId) {
canEditActivities: settings[WORKSPACE_TYPE] !== WORKSPACE_TYPE_MANAGEMENT,
activityStatus: CommonActivityHelper.getActivityStatus(activity),
activityWorkspace: activityInfo.activityWorkspace,
- calendar: {id: settings[CALENDAR_ID], [IS_FISCAL]: settings[CALENDAR_IS_FISCAL]},
+ calendar: { id: settings[CALENDAR_ID], [IS_FISCAL]: settings[CALENDAR_IS_FISCAL] },
workspaceLeadData: activityInfo[ACTIVITY_WORKSPACE_LEAD_DATA],
effectiveCurrency: settings[Constants.EFFECTIVE_CURRENCY].code,
teamMember: activityInfo.teamMember,
@@ -236,7 +254,7 @@ export function loadActivityForActivityPreview(activityId) {
payload: {
activityWsInfo: activityWsInfo
}
- })
+ });
}).catch(error => {
return dispatch({
type: ACTIVITY_LOAD_FAILED,
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ResourceAction.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ResourceAction.jsx
index 03ccdab5d5f..12c616c0501 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ResourceAction.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ResourceAction.jsx
@@ -3,24 +3,28 @@ import {FieldsManager} from 'amp-ui';
import LoggerManager from '../utils/LoggerManager';
import processPossibleValues from '../common/PossibleValuesHelper.jsx';
import { ResourceConstants, ActivityConstants } from 'amp-ui';
+import {MULTILINGUAL} from "amp/modules/activity/preview/common/ReampConstants";
export const RESOURCES_LOAD_LOADING = 'RESOURCES_LOAD_LOADING';
export const RESOURCES_LOAD_LOADED = 'RESOURCES_LOAD_LOADED';
export const RESOURCES_LOAD_FAILED = 'RESOURCES_LOAD_FAILED';
export const loadResourcesForActivity = (activity) => (dispatch, ownProps) => {
- const resourcesByUuids =
- new Set(activity[ActivityConstants.ACTIVITY_DOCUMENTS].map(r => r[ResourceConstants.UUID]));
- const resourcesByUUID = Array.from(resourcesByUuids);
- dispatch({
- type: RESOURCES_LOAD_LOADING
- })
- return loadHydratedResources(resourcesByUUID)(dispatch, ownProps);
+ if (activity.hasOwnProperty(ActivityConstants.ACTIVITY_DOCUMENTS)
+ && activity[ActivityConstants.ACTIVITY_DOCUMENTS] !== null) {
+ const resourcesByUuids =
+ new Set(activity[ActivityConstants.ACTIVITY_DOCUMENTS].map(r => r[ResourceConstants.UUID]));
+ const resourcesByUUID = Array.from(resourcesByUuids);
+ dispatch({
+ type: RESOURCES_LOAD_LOADING
+ })
+ return loadHydratedResources(resourcesByUUID)(dispatch, ownProps);
+ }
}
export const loadHydratedResources = (ids) => (dispatch, ownProps) => {
const resourcesFields = [ResourceConstants.RESOURCE_TYPE, ResourceConstants.TYPE];
const { settings } = ownProps().startUpReducer;
- Promise.all([ResourceApi.fetchResources(ids),
+ Promise.all([ResourceApi.fetchResources(ids, settings.language),
ResourceApi.getResourcesEnabledFields(), ResourceApi.fetchPossibleValues(resourcesFields)])
.then(([resourcesByUUIDRaw, rFields, possibleValuesCollection]) => {
const resourcesByUUID = {};
@@ -29,7 +33,7 @@ export const loadHydratedResources = (ids) => (dispatch, ownProps) => {
r.id = r.uuid;
});
const resourceFieldsManager = new FieldsManager(rFields, processPossibleValues(possibleValuesCollection),
- settings.language,LoggerManager);
+ settings.language,LoggerManager, null, settings[MULTILINGUAL]);
dispatch({
type: RESOURCES_LOAD_LOADED,
payload: {
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx
index 66007c7468a..84ff42eef79 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/StartUpAction.jsx
@@ -2,6 +2,7 @@ import { loadTranslations } from 'amp/modules/translate';
import { initialTranslations } from '../common/initialTranslations';
import TranslationManager from '../utils/TranslationManager';
import StartUpApi from "../api/StartUpApi";
+import { GS_DEFAULT_CALENDAR } from '../common/ReampConstants';
/**
*
@@ -9,15 +10,23 @@ import StartUpApi from "../api/StartUpApi";
export const STATE_TRANSLATIONS_LOADED = 'STATE_TRANSLATIONS_LOADED';
export const STATE_APP_INITIALIZED = 'STATE_APP_INITIALIZED';
+const fetchGlobalSettingsAndCalendar = () => StartUpApi.fetchGlobalSettings()
+ .then(globalSettings => StartUpApi.fetchCalendar(globalSettings[GS_DEFAULT_CALENDAR])
+ .then(calendars => ({ globalSettings, calendar: calendars.find(calendar => calendar.id == globalSettings[GS_DEFAULT_CALENDAR]) })));
+
export function startUp(dispatch) {
- return Promise.all([StartUpApi.fetchSettings(),
- loadTranslations(initialTranslations)]).then(([settings, trns]) => {
+ return Promise.all([
+ StartUpApi.fetchSettings(),
+ fetchGlobalSettingsAndCalendar(),
+ loadTranslations(initialTranslations),
+ ]).then(([settings, gsAndCal, trns]) => {
TranslationManager.initializeTranslations(trns);
return dispatch({
type: STATE_APP_INITIALIZED,
payload: {
translations: trns,
- settings
+ settings,
+ ...gsAndCal,
}
});
});
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/api/ActivityApi.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/api/ActivityApi.jsx
index 0632183b2c9..6e2038cc7a8 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/api/ActivityApi.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/api/ActivityApi.jsx
@@ -6,8 +6,8 @@ import {
export default class ActivityApi {
- static getActivity(activityId) {
- const url = ACTIVITY_API + activityId;
+ static getActivity(activityId, language = 'en') {
+ const url = ACTIVITY_API + activityId + '?language=' + language;
return ApiHelper._fetchData(url);
}
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/api/ResourceApi.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/api/ResourceApi.jsx
index bf4af3cb4a9..37707695261 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/api/ResourceApi.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/api/ResourceApi.jsx
@@ -8,8 +8,8 @@ export default class ResourceApi {
return ApiHelper._fetchData(url);
}
- static fetchResources(resourceUUID) {
- const url = RESOURCES_API;
+ static fetchResources(resourceUUID, language = 'en') {
+ const url = `${RESOURCES_API}?language=${language}`;
return ApiHelper._postData(url, resourceUUID);
}
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx
index 1919f9f33fe..db827662d14 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/api/StartUpApi.jsx
@@ -1,4 +1,4 @@
-import { SETTINGS_API } from '../common/ReampConstants';
+import { SETTINGS_API, GLOBAL_SETTINGS_API, CALENDAR_API } from '../common/ReampConstants';
import { fetchJson, postJson } from 'amp/tools/index';
export default class StartUpApi {
@@ -6,6 +6,14 @@ export default class StartUpApi {
const url = SETTINGS_API;
return StartUpApi._fetchData(url);
}
+ static fetchGlobalSettings() {
+ const url = GLOBAL_SETTINGS_API;
+ return StartUpApi._fetchData(url);
+ }
+ static fetchCalendar(id) {
+ const url = `${CALENDAR_API}?id=${id}`;
+ return StartUpApi._fetchData(url);
+ }
static _fetchData(url) {
return new Promise((resolve, reject) => {
return fetchJson(url).then((result) => {
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx
index 700d8c04d69..a4250ed4532 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/common/ReampConstants.jsx
@@ -7,6 +7,8 @@ export const FIELDS_DEFINITION_API = '/rest/activity/fields-no-workspace';
export const POSSIBLE_VALUES_API = '/rest/activity/field/values/public';
export const FM_API = '/rest/common/fm';
export const SETTINGS_API = '/rest/amp/settings';
+export const GLOBAL_SETTINGS_API = '/rest/amp/global-settings/public';
+export const CALENDAR_API = '/rest/calendar';
export const ACTIVITY_FIELDS_ID_VALUES_API = '/rest/activity/field/id-values/ws_id?translations=en&language=en';
export const RESOURCES_POSSIBLE_VALUES_API = '/rest/resource/field/values';
export const RESOURCES_ENABLED_FIELDS_API = '/rest/resource/fields';
@@ -31,6 +33,8 @@ export const TRANSACTION_ID = 'transaction_id';
export const WORKSPACE_TYPE = 'workspace-type';
export const WORKSPACE_TYPE_MANAGEMENT = 'Management';
+export const GS_DEFAULT_CALENDAR = 'Default Calendar';
+
export const ACTIVITY_FORM_URL = '/wicket/onepager/activity';
export const ACTIVITY_FORM_URL_SSC = '/wicket/onepager/ssc';
export const ACTIVITY_PREVIEW_URL = '/aim/viewActivityPreview.do~activityId=';
@@ -41,4 +45,6 @@ export const COMPARE_ACTIVITY_URL = '/aim/compareActivityVersions.do';
export const PRODUCTION = 'production';
export const REGIONAL_FUNDINGS = [ActivityConstants.REGIONAL_FUNDINGS_COMMITMENTS,
ActivityConstants.REGIONAL_FUNDINGS_DISBURSEMENTS,
- ActivityConstants.REGIONAL_FUNDINGS_EXPENDITURES];
\ No newline at end of file
+ ActivityConstants.REGIONAL_FUNDINGS_EXPENDITURES];
+
+export const MULTILINGUAL = 'multilingual';
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx
index 62952b96ce9..b5408b4a1fa 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/common/initialTranslations.jsx
@@ -488,5 +488,6 @@ export const initialTranslations = {
"editPermissionError": "You do not have permissions to edit this activity.",
"sameUserEditingError": "You may only edit one activity at a time.",
"exportToWord":"Export to Word",
- "disbursementId":"Disbursement ID"
+ "disbursementId":"Disbursement ID",
+ "0208": "Couldn't find activity! It may be no longer exists in the system"
}
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx
index 981660c3215..c070a76ca42 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/containers/App.jsx
@@ -1,5 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
+import { createSelector } from 'reselect'
import {ActivityPreviewUI, FieldsManager, CurrencyRatesManager, ErrorHelper} from 'amp-ui';
import * as ActivityActions from '../actions/ActivityActions';
import ActivityFundingTotals from '../utils/ActivityFundingTotals';
@@ -11,6 +12,14 @@ import {bindActionCreators} from "redux";
import {connect} from "react-redux";
import {APDocumentPage} from '../containers/APDocumentPage.jsx';
+const getActivityContext = createSelector(
+ props => props.activityReducer,
+ props => props.startUpReducer,
+ (activityReducer, startUpReducer) => ({
+ ...activityReducer.activityContext,
+ calendar: startUpReducer.calendar,
+ }));
+
/**
*
*/
@@ -27,8 +36,9 @@ class App extends Component {
contactsByIds: PropTypes.object,
APDocumentPage: PropTypes.func.isRequired,
resourceReducer: PropTypes.object,
- activityWsInfo: PropTypes.array.isRequired
-
+ activityWsInfo: PropTypes.array.isRequired,
+ globalSettings: PropTypes.object.isRequired,
+ reportingTotals: PropTypes.object
}
constructor(props, context) {
@@ -40,7 +50,7 @@ class App extends Component {
}
getChildContext() {
- const {activityFieldsManager, activityFundingTotals} = this.props.activityReducer;
+ const {activityFieldsManager, activityFundingTotals, reportingTotals} = this.props.activityReducer;
const {contactsByIds, contactFieldsManager} = this.props.contactReducer;
return {
activityFieldsManager,
@@ -54,7 +64,9 @@ class App extends Component {
currencyRatesManager: this.props.activityReducer.currencyRatesManager,
APDocumentPage,
resourceReducer: this.props.resourceReducer,
- activityWsInfo: this.props.activityReducer.activityWsInfo
+ activityWsInfo: this.props.activityReducer.activityWsInfo,
+ globalSettings: this.props.startUpReducer.globalSettings,
+ reportingTotals
};
}
@@ -71,7 +83,8 @@ class App extends Component {
)
} else {
- const {activity, activityContext, error} = this.props.activityReducer;
+ const {activity, error} = this.props.activityReducer;
+ const activityContext = getActivityContext(this.props);
if (error) {
return ErrorHelper.showErrors(error, translate);
} else {
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx
index f8e83f45a24..99d8706bdab 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/ActivityReducer.jsx
@@ -29,13 +29,15 @@ export default function activityReducer(state: Object = defaultState, action: Ob
activityFundingTotals: action.payload.activityFundingTotals,
currencyRatesManager: action.payload.currencyRatesManager,
isActivityLoading: false,
- isActivityLoaded: true
+ isActivityLoaded: true,
+ reportingTotals: action.payload.reportingTotals
};
case ACTIVITY_LOAD_FAILED:
return {
...state,
error: action.payload.error,
- isActivityLoading: false
+ isActivityLoading: false,
+ isActivityLoaded: true
};
case ACTIVITY_WS_INFO_LOADED:
return {...state, activityWsInfo: action.payload.activityWsInfo};
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx
index 42af602f19d..f77251ef409 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/reducers/StartUpReducer.jsx
@@ -19,7 +19,9 @@ export default function startUpReducer(state: Object = defaultState, action: Obj
return Object.assign({}, state, {
translations: action.payload.translations,
isStartupInProgress: false,
- settings: action.payload.settings
+ settings: action.payload.settings,
+ globalSettings: action.payload.globalSettings,
+ calendar: action.payload.calendar,
});
default:
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx
index 7811d9c6bbb..b1420394916 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/ApiHelper.jsx
@@ -1,4 +1,5 @@
import {fetchJson, postJson} from 'amp/tools/index';
+import translate from '../utils/translate';
export default class ApiHelper {
static extractErrors(errors, obj) {
@@ -6,9 +7,10 @@ export default class ApiHelper {
if (errors) {
errors = Array.isArray(errors) ? errors : [errors];
errors.forEach((error) => {
- for (const key in error) {
- const messageKey = 'amp.preview:server-errors-' + key;
- const message = {messageKey};
+ for (const _key in error) {
+ const message = {
+ messageKey: this.handleApiErrors(_key, translate),
+ };
if (obj && obj.id) {
message.id = obj.id;
}
@@ -20,6 +22,10 @@ export default class ApiHelper {
return errorMessages;
}
+ static handleApiErrors(errorCode, translateFn) {
+ return translateFn(errorCode);
+ }
+
static _fetchData(url) {
return new Promise((resolve, reject) => {
return fetchJson(url).then((result) => {
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx
index d1e0d938209..06d6fd2a635 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/DateUtils.jsx
@@ -28,4 +28,8 @@ export default class DateUtils {
}
}
}
+
+ static getYearFromDate(date) {
+ return Moment(date).year();
+ }
}
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/utils/HydratorHelper.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/utils/HydratorHelper.jsx
index 406c3e46d80..839628e74ab 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/utils/HydratorHelper.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/utils/HydratorHelper.jsx
@@ -28,10 +28,13 @@ export default class HydratorHelper {
fieldToHydrate = parent + "~";
}
fieldToHydrate = fieldToHydrate + objectField;
- if (fieldsManager.getFieldDef(fieldToHydrate)) {
- if (fieldsManager.getFieldDef(fieldToHydrate)['id_only'] === true) {
+
+ const fieldDefinition = fieldsManager.getFieldDef(fieldToHydrate);
+ if (fieldDefinition) {
+ if (fieldDefinition['id_only'] === true) {
if (objectToHydrate[objectField]) {
if (!valuesForHydration) {
+ //If we don't have values for hydration, means that we need to fill on RequestData what fields we need to hydrate
if (requestData[fieldToHydrate]) {
requestData[fieldToHydrate].push(objectToHydrate[objectField]);
} else {
@@ -41,6 +44,7 @@ export default class HydratorHelper {
objectToHydrate[objectField] = valuesForHydration[fieldToHydrate]
.find(field => field.id === objectToHydrate[objectField]);
}
+
if (objectToHydrate[objectField]['ancestor-values']) {
objectToHydrate[objectField][ActivityConstants.HIERARCHICAL_VALUE] =
objectToHydrate[objectField]['ancestor-values'].map(i=>'[' + i + ']').join('');
diff --git a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx b/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx
index b7a76e3bc33..19f2ec44645 100644
--- a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx
+++ b/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/components/DataFreezeEventEdit.jsx
@@ -49,6 +49,14 @@ class DataFreezeEventEdit extends Component {
let field = event.target.getAttribute('data-field');
let toggleState = this.state.showDatePicker;
toggleState[field] = !toggleState[field];
+ if (toggleState[field] == true) {
+ Object.keys(toggleState).forEach(key => {
+ if (key !== field) {
+ toggleState[key] = false;
+ }
+ });
+ }
+
this.setState({
showDatePicker: toggleState
});
@@ -58,7 +66,10 @@ class DataFreezeEventEdit extends Component {
let currentRecord = this.props.dataFreezeEvent;
currentRecord.freezingDate = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT);
this.setState({
- currentRecord: currentRecord
+ currentRecord: currentRecord,
+ showDatePicker: {
+ freezingDate: false
+ }
});
}
@@ -66,7 +77,10 @@ class DataFreezeEventEdit extends Component {
let currentRecord = this.props.dataFreezeEvent;
currentRecord.openPeriodStart = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT);
this.setState({
- currentRecord: currentRecord
+ currentRecord: currentRecord,
+ showDatePicker: {
+ openPeriodStart: false
+ }
});
}
@@ -74,7 +88,10 @@ class DataFreezeEventEdit extends Component {
let currentRecord = this.props.dataFreezeEvent;
currentRecord.openPeriodEnd = moment(date, this.getDisplayDateFormat()).format(Constants.EP_DATE_FORMAT);
this.setState({
- currentRecord: currentRecord
+ currentRecord: currentRecord,
+ showDatePicker: {
+ openPeriodEnd: false
+ }
});
}
diff --git a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/styles/images/.DS_Store b/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/styles/images/.DS_Store
deleted file mode 100644
index 6e597001d68..00000000000
Binary files a/amp/TEMPLATE/reamp/modules/admin/data-freeze-manager/styles/images/.DS_Store and /dev/null differ
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
index 0d797d854f8..b30d2a3af7c 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
@@ -4,6 +4,7 @@ export const CALENDAR_SETTING = 'calendar-id';
export const ETH_BASE_CALENDAR = 'ETH-CAL';
export const GREG_BASE_CALENDAR = 'GREG-CAL';
export const EP_DATE_FORMAT = 'YYYY-MM-DD';
+export const CALENDAR_IS_FISCAL = 'is-fiscal';
export const NATIONAL_BUDGET_EXECUTION_PROCEDURES = 'National Budget Execution Procedures';
export const NATIONAL_FINANCIAL_REPORTING_PROCEDURES = 'National Financial Reporting Procedures';
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
index 69c93172348..411884840ac 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
@@ -95,7 +95,7 @@ class Utils {
static getCalendarPrefix(settingsWidget, calendars, translatedFY){
const fiscalYear = translatedFY ? translatedFY : Constants.FY;
const cal = calendars.filter( calendar => calendar.id == Utils.getCalendarId(settingsWidget) )[0];
- return cal.isFiscal ? fiscalYear + ' ' : '';
+ return cal[Constants.CALENDAR_IS_FISCAL] ? fiscalYear + ' ' : '';
}
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
index cbcfbec1e75..f4ee7a82030 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
@@ -1,6 +1,8 @@
import React, { Component } from 'react';
import { Tooltip, OverlayTrigger } from 'react-bootstrap';
import { IMG_VALUE } from '../common/Constants';
+import {bindActionCreators} from "redux";
+import {connect} from "react-redux";
class HeaderToolTip extends Component {
@@ -39,3 +41,17 @@ import { IMG_VALUE } from '../common/Constants';
);
}
}
+
+
+function mapStateToProps( state, ownProps ) {
+ return {
+ translations: state.startUp.translations,
+ translate: state.startUp.translate
+ }
+}
+
+function mapDispatchToProps( dispatch ) {
+ return {actions: bindActionCreators({}, dispatch)}
+}
+
+export default connect( mapStateToProps, mapDispatchToProps )( HeaderToolTip );
diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json
index f4be8010cb2..80a50d06d36 100644
--- a/amp/TEMPLATE/reamp/package-lock.json
+++ b/amp/TEMPLATE/reamp/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "reamp",
"version": "0.1.0",
"license": "inherit",
"dependencies": {
@@ -17,10 +18,11 @@
"react-modal": "^3.3.1",
"react-number-input": "^15.0.0-rc2",
"react-select": "^1.0.0-rc.3",
+ "reselect": "^4.1.7",
"uglifyjs-webpack-plugin": "^1.3.0"
},
"devDependencies": {
- "amp-ui": "git+ssh://github.com/devgateway/amp-ui#develop",
+ "amp-ui": "github:devgateway/amp-ui#develop",
"babel-core": "^6.26.3",
"babel-jest": "^6.0.1",
"babel-loader": "^6.3.2",
@@ -57,15 +59,85 @@
"redux": "^3.6.0",
"redux-logger": "^2.7.4",
"redux-thunk": "2.2.0",
+ "source-map-loader": "^0.2.4",
"style-loader": "^0.12.3",
"webpack": "^1.13.3",
"webpack-dev-server": "^1.10.1",
"whatwg-fetch": "^0.9.0"
}
},
+ "../../../../amp-ui": {
+ "version": "2.1.1",
+ "extraneous": true,
+ "license": "MIT",
+ "dependencies": {
+ "docx": "^4.7.1",
+ "file-saver": "github:devgateway/FileSaver.js",
+ "fs": "0.0.1-security",
+ "he": "^1.2.0",
+ "moment": "^2.18.1",
+ "react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3"
+ },
+ "devDependencies": {
+ "@svgr/rollup": "^2.4.1",
+ "babel-core": "^6.26.3",
+ "babel-eslint": "^8.2.5",
+ "babel-plugin-external-helpers": "^6.22.0",
+ "babel-preset-env": "^1.7.0",
+ "babel-preset-react": "^6.24.1",
+ "babel-preset-stage-0": "^6.24.1",
+ "cross-env": "^5.1.4",
+ "docx": "^4.7.1",
+ "eslint": "^4.1.1",
+ "eslint-config-airbnb": "^15.0.0",
+ "eslint-config-standard": "^11.0.0",
+ "eslint-config-standard-react": "^6.0.0",
+ "eslint-formatter-pretty": "^1.1.0",
+ "eslint-plugin-flowtype-errors": "^2.0.1",
+ "eslint-plugin-import": "^2.13.0",
+ "eslint-plugin-jsx-a11y": "^5.0.0",
+ "eslint-plugin-mocha": "^4.7.0",
+ "eslint-plugin-node": "^7.0.1",
+ "eslint-plugin-promise": "^4.0.0",
+ "eslint-plugin-react": "^7.10.0",
+ "eslint-plugin-standard": "^3.1.0",
+ "file-saver": "git+ssh://github.com/devgateway/FileSaver.js",
+ "fs": "0.0.1-security",
+ "gh-pages": "^1.2.0",
+ "numeral": "^2.0.6",
+ "rc-checkbox": "^1.5.0",
+ "react": "15.4.2",
+ "react-bootstrap": "0.32.4",
+ "react-bootstrap-table": "^3.4.1",
+ "react-dom": "15.4.2",
+ "react-router": "^3.0.0",
+ "react-scripts": "^1.1.4",
+ "react-scrollspy": "3.1.1",
+ "rollup": "^0.64.1",
+ "rollup-plugin-babel": "^3.0.7",
+ "rollup-plugin-commonjs": "^9.1.3",
+ "rollup-plugin-img": "^1.1.0",
+ "rollup-plugin-node-resolve": "^3.3.0",
+ "rollup-plugin-peer-deps-external": "^2.2.0",
+ "rollup-plugin-postcss": "^1.6.2",
+ "rollup-plugin-url": "^1.4.0"
+ },
+ "engines": {
+ "node": ">=16",
+ "npm": ">=7"
+ },
+ "peerDependencies": {
+ "prop-types": "^15.5.4",
+ "react": "15.4.2",
+ "react-bootstrap": "0.32.4",
+ "react-bootstrap-table": "^3.4.1",
+ "react-dom": "15.4.2",
+ "react-scrollspy": "3.1.1"
+ }
+ },
"node_modules/@allenfang/react-toastr": {
"version": "2.8.2",
- "integrity": "sha1-C+9lhRieBXHda9/E75i8n5xH2gw=",
+ "integrity": "sha512-RlD4RTWghz1beVN8zoh4b6xkJp3OEEb4UVEzny6v9lmlWRw1UeTIVYfSZIQhQDq2VE2Yp2NkAzW1aP/LrO/vdg==",
"dependencies": {
"classnames": "^2.2.5",
"element-class": "^0.2.2",
@@ -77,7 +149,7 @@
},
"node_modules/@allenfang/react-toastr/node_modules/react": {
"version": "15.3.2",
- "integrity": "sha1-p7zNL+6K8SawMX4iLCjR1UUo0J4=",
+ "integrity": "sha512-yuJfSdf7yIqy2FrRFuepZtHEBRoatL/eGiZmgXe6d4jeNxWM0YZIacgXlabP9P2W9bPcmRBJOCXBqpP72lsTVA==",
"dependencies": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -89,44 +161,45 @@
},
"node_modules/@allenfang/react-toastr/node_modules/react-dom": {
"version": "15.3.2",
- "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=",
+ "integrity": "sha512-FZuPYXNZx/xRYyE41uPlLpXAVwbQ4gyB38xPDu+osflCntg5MgIfBAmbhEsKkbzTBYWifjzrVsRzbncHFIPLkw==",
"peerDependencies": {
"react": "^15.3.2"
}
},
"node_modules/@babel/runtime": {
- "version": "7.17.2",
- "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+ "version": "7.23.1",
+ "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==",
"dependencies": {
- "regenerator-runtime": "^0.13.4"
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/runtime-corejs2": {
- "version": "7.17.2",
- "integrity": "sha512-EamjJvKlHTdSmJ8t6yHtqttdiA3xThvTNdmGb0Kh0oqRhV1SU2JGFU5TjVCg35Vnn8MYfUBHHtLZYHIY+W28qw==",
+ "version": "7.23.1",
+ "integrity": "sha512-eY39r8IIgbcDfILJqsflwMImjccvK3QdgBRKo5v6lDPd5SiAsyfl3SJuAYWJ5hgbz7kfQmZ9ueirnhq0e9176Q==",
"dev": true,
"dependencies": {
- "core-js": "^2.6.5",
- "regenerator-runtime": "^0.13.4"
+ "core-js": "^2.6.12",
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/runtime-corejs2/node_modules/regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+ "version": "0.14.0",
+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
"dev": true
},
"node_modules/@babel/runtime/node_modules/regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+ "version": "0.14.0",
+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
},
"node_modules/@types/image-size": {
"version": "0.0.29",
+ "resolved": "https://registry.npmjs.org/@types/image-size/-/image-size-0.0.29.tgz",
"integrity": "sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg==",
"dev": true,
"dependencies": {
@@ -135,6 +208,7 @@
},
"node_modules/@types/jszip": {
"version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.4.1.tgz",
"integrity": "sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A==",
"deprecated": "This is a stub types definition. jszip provides its own type definitions, so you do not need this installed.",
"dev": true,
@@ -143,13 +217,14 @@
}
},
"node_modules/@types/node": {
- "version": "17.0.19",
- "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==",
+ "version": "20.8.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
+ "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
"dev": true
},
"node_modules/abbrev": {
"version": "1.0.9",
- "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+ "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
"dev": true
},
"node_modules/accepts": {
@@ -166,7 +241,7 @@
},
"node_modules/acorn": {
"version": "2.7.0",
- "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
+ "integrity": "sha512-pXK8ez/pVjqFdAgBkF1YPVRacuLQ9EXBKaKWaeh58WNfMkCmZhOZzu+NtKSPD5PHmCCHheQ5cD29qM1K4QTxIg==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -177,7 +252,7 @@
},
"node_modules/acorn-globals": {
"version": "1.0.9",
- "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+ "integrity": "sha512-j3/4pkfih8W4NK22gxVSXcEonTpAHOHh0hu5BoZrKcOsW/4oBPxTi4Yk3SAj+FhC1f3+bRTkXdm4019gw1vg9g==",
"dev": true,
"dependencies": {
"acorn": "^2.1.0"
@@ -213,7 +288,7 @@
},
"node_modules/align-text": {
"version": "0.1.4",
- "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+ "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2",
@@ -226,20 +301,20 @@
},
"node_modules/amdefine": {
"version": "1.0.1",
- "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
"dev": true,
"engines": {
"node": ">=0.4.2"
}
},
"node_modules/amp-ui": {
- "version": "2.1.0",
- "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#bc63cd7e9b1dd2add7375e3ae21ab4b45cfc062f",
+ "version": "2.1.1",
+ "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#610fb5ec861a7e2cf356496180bfdca974be1f39",
"dev": true,
"license": "MIT",
"dependencies": {
"docx": "^4.7.1",
- "file-saver": "git+ssh://github.com/devgateway/FileSaver.js",
+ "file-saver": "github:devgateway/FileSaver.js",
"fs": "0.0.1-security",
"he": "^1.2.0",
"moment": "^2.18.1",
@@ -258,29 +333,16 @@
"react-scrollspy": "3.1.1"
}
},
- "node_modules/amp-ui/node_modules/react-router-hash-link": {
- "name": "react-router-hash-link-v2/3",
- "resolved": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "object-assign": "^4.1.0",
- "react": "^15.4.1",
- "react-dom": "^15.4.1",
- "react-interactive": "^0.4.0",
- "react-router": "^3.0.0"
- }
- },
"node_modules/ansi-regex": {
"version": "2.1.1",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ansi-styles": {
"version": "2.2.1",
- "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
"engines": {
"node": ">=0.10.0"
}
@@ -308,7 +370,7 @@
},
"node_modules/arr-diff": {
"version": "2.0.0",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+ "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
"dependencies": {
"arr-flatten": "^1.0.1"
},
@@ -325,7 +387,7 @@
},
"node_modules/arr-union": {
"version": "3.1.0",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+ "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -333,26 +395,26 @@
},
"node_modules/array-flatten": {
"version": "1.1.1",
- "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
"dev": true
},
"node_modules/array-unique": {
"version": "0.2.1",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+ "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/arrify": {
"version": "1.0.1",
- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/asap": {
"version": "2.0.6",
- "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
},
"node_modules/asn1": {
"version": "0.2.6",
@@ -363,38 +425,25 @@
}
},
"node_modules/assert": {
- "version": "1.5.0",
- "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+ "version": "1.5.1",
+ "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
"dev": true,
"dependencies": {
- "object-assign": "^4.1.1",
- "util": "0.10.3"
+ "object.assign": "^4.1.4",
+ "util": "^0.10.4"
}
},
"node_modules/assert-plus": {
"version": "1.0.0",
- "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
"dev": true,
"engines": {
"node": ">=0.8"
}
},
- "node_modules/assert/node_modules/inherits": {
- "version": "2.0.1",
- "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
- "dev": true
- },
- "node_modules/assert/node_modules/util": {
- "version": "0.10.3",
- "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
- "dev": true,
- "dependencies": {
- "inherits": "2.0.1"
- }
- },
"node_modules/assign-symbols": {
"version": "1.0.0",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+ "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -402,17 +451,23 @@
},
"node_modules/async": {
"version": "1.5.2",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+ "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
"dev": true
},
"node_modules/async-each": {
- "version": "1.0.3",
- "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
- "dev": true
+ "version": "1.0.6",
+ "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://paulmillr.com/funding/"
+ }
+ ]
},
"node_modules/asynckit": {
"version": "0.4.0",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
"dev": true
},
"node_modules/atob": {
@@ -428,7 +483,7 @@
},
"node_modules/autoprefixer-core": {
"version": "5.2.1",
- "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=",
+ "integrity": "sha512-1X4srCG0vAe2ArX9d3Kfkuo5yREFZwKE5mH+VHZHIhmx0V8UjDPAKmNgJlWxxNbCAraHiDPTcT2kc+3i73jR/Q==",
"dev": true,
"dependencies": {
"browserslist": "~0.4.0",
@@ -439,20 +494,20 @@
},
"node_modules/aws-sign2": {
"version": "0.7.0",
- "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
"dev": true,
"engines": {
"node": "*"
}
},
"node_modules/aws4": {
- "version": "1.11.0",
- "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+ "version": "1.12.0",
+ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
"dev": true
},
"node_modules/babel-code-frame": {
"version": "6.26.0",
- "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+ "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
"dependencies": {
"chalk": "^1.1.3",
"esutils": "^2.0.2",
@@ -500,7 +555,7 @@
},
"node_modules/babel-helper-bindify-decorators": {
"version": "6.24.1",
- "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+ "integrity": "sha512-TYX2QQATKA6Wssp6j7jqlw4QLmABDN1olRdEHndYvBXdaXM5dcx6j5rN0+nd+aVL+Th40fAEYvvw/Xxd/LETuQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -510,7 +565,7 @@
},
"node_modules/babel-helper-builder-binary-assignment-operator-visitor": {
"version": "6.24.1",
- "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+ "integrity": "sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q==",
"dev": true,
"dependencies": {
"babel-helper-explode-assignable-expression": "^6.24.1",
@@ -520,7 +575,7 @@
},
"node_modules/babel-helper-builder-react-jsx": {
"version": "6.26.0",
- "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+ "integrity": "sha512-02I9jDjnVEuGy2BR3LRm9nPRb/+Ja0pvZVLr1eI5TYAA/dB0Xoc+WBo50+aDfhGDLhlBY1+QURjn9uvcFd8gzg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -530,7 +585,7 @@
},
"node_modules/babel-helper-call-delegate": {
"version": "6.24.1",
- "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+ "integrity": "sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==",
"dev": true,
"dependencies": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -541,7 +596,7 @@
},
"node_modules/babel-helper-define-map": {
"version": "6.26.0",
- "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+ "integrity": "sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -552,7 +607,7 @@
},
"node_modules/babel-helper-explode-assignable-expression": {
"version": "6.24.1",
- "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+ "integrity": "sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -562,7 +617,7 @@
},
"node_modules/babel-helper-explode-class": {
"version": "6.24.1",
- "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+ "integrity": "sha512-SFbWewr0/0U4AiRzsHqwsbOQeLXVa9T1ELdqEa2efcQB5KopTnunAqoj07TuHlN2lfTQNPGO/rJR4FMln5fVcA==",
"dev": true,
"dependencies": {
"babel-helper-bindify-decorators": "^6.24.1",
@@ -573,7 +628,7 @@
},
"node_modules/babel-helper-function-name": {
"version": "6.24.1",
- "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+ "integrity": "sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==",
"dev": true,
"dependencies": {
"babel-helper-get-function-arity": "^6.24.1",
@@ -585,7 +640,7 @@
},
"node_modules/babel-helper-get-function-arity": {
"version": "6.24.1",
- "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+ "integrity": "sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -594,7 +649,7 @@
},
"node_modules/babel-helper-hoist-variables": {
"version": "6.24.1",
- "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+ "integrity": "sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -603,7 +658,7 @@
},
"node_modules/babel-helper-optimise-call-expression": {
"version": "6.24.1",
- "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+ "integrity": "sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -612,7 +667,7 @@
},
"node_modules/babel-helper-regex": {
"version": "6.26.0",
- "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+ "integrity": "sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -622,7 +677,7 @@
},
"node_modules/babel-helper-remap-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+ "integrity": "sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -634,7 +689,7 @@
},
"node_modules/babel-helper-replace-supers": {
"version": "6.24.1",
- "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+ "integrity": "sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==",
"dev": true,
"dependencies": {
"babel-helper-optimise-call-expression": "^6.24.1",
@@ -647,7 +702,7 @@
},
"node_modules/babel-helpers": {
"version": "6.24.1",
- "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+ "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
"dependencies": {
"babel-runtime": "^6.22.0",
"babel-template": "^6.24.1"
@@ -655,7 +710,7 @@
},
"node_modules/babel-jest": {
"version": "6.0.1",
- "integrity": "sha1-MTRjrSN22I5LaxMmRMu896pWMiE=",
+ "integrity": "sha512-IIqUfsIE62+lEDMhOFFiSv7O3evYSyyaBkYthfpL3EzmMjCTrCKGGduflxUxrzt8updYOEyvXONuRe1NIGUT4A==",
"dev": true,
"dependencies": {
"babel-core": "^6.0.0"
@@ -663,7 +718,7 @@
},
"node_modules/babel-loader": {
"version": "6.4.1",
- "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
+ "integrity": "sha512-hHvbCsXtwKIznu5Qmqfe/IwZ4O5frqe+j04fN/5u/9Rg48dpWIKyYqAN68N1wwqGSMToo4FhU9/MrH+QZlFdkQ==",
"dev": true,
"dependencies": {
"find-cache-dir": "^0.1.1",
@@ -678,14 +733,14 @@
},
"node_modules/babel-messages": {
"version": "6.23.0",
- "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+ "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
"dependencies": {
"babel-runtime": "^6.22.0"
}
},
"node_modules/babel-plugin-check-es2015-constants": {
"version": "6.22.0",
- "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+ "integrity": "sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -703,7 +758,7 @@
},
"node_modules/babel-plugin-istanbul/node_modules/find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
"dependencies": {
"locate-path": "^2.0.0"
},
@@ -713,80 +768,80 @@
},
"node_modules/babel-plugin-jest-hoist": {
"version": "19.0.0",
- "integrity": "sha1-SuKgTqYSpuc2UfP95SwXiZEwS+o="
+ "integrity": "sha512-bMlU8Y0lmia0Ari/qSjulDS1H7rPLtT5I4LBhk8oN/u0CzlAiVxcvU8nTgx0915aZx9+eboVBGbm0TJaEWM3NA=="
},
"node_modules/babel-plugin-syntax-async-functions": {
"version": "6.13.0",
- "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+ "integrity": "sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw==",
"dev": true
},
"node_modules/babel-plugin-syntax-async-generators": {
"version": "6.13.0",
- "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+ "integrity": "sha512-EbciFN5Jb9iqU9bqaLmmFLx2G8pAUsvpWJ6OzOWBNrSY9qTohXj+7YfZx6Ug1Qqh7tCb1EA7Jvn9bMC1HBiucg==",
"dev": true
},
"node_modules/babel-plugin-syntax-class-constructor-call": {
"version": "6.18.0",
- "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+ "integrity": "sha512-EEuBcXz/wZ81Jaac0LnMHtD4Mfz9XWn2oH2Xj+CHwz2SZWUqqdtR2BgWPSdTGMmxN/5KLSh4PImt9+9ZedDarA==",
"dev": true
},
"node_modules/babel-plugin-syntax-class-properties": {
"version": "6.13.0",
- "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+ "integrity": "sha512-chI3Rt9T1AbrQD1s+vxw3KcwC9yHtF621/MacuItITfZX344uhQoANjpoSJZleAmW2tjlolqB/f+h7jIqXa7pA==",
"dev": true
},
"node_modules/babel-plugin-syntax-decorators": {
"version": "6.13.0",
- "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+ "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
"dev": true
},
"node_modules/babel-plugin-syntax-do-expressions": {
"version": "6.13.0",
- "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+ "integrity": "sha512-HD/5qJB9oSXzl0caxM+aRD7ENICXqcc3Up/8toDQk7zNIDE7TzsqtxC5f4t9Rwhu2Ya8l9l4j6b3vOsy+a6qxg==",
"dev": true
},
"node_modules/babel-plugin-syntax-dynamic-import": {
"version": "6.18.0",
- "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+ "integrity": "sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==",
"dev": true
},
"node_modules/babel-plugin-syntax-exponentiation-operator": {
"version": "6.13.0",
- "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+ "integrity": "sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ==",
"dev": true
},
"node_modules/babel-plugin-syntax-export-extensions": {
"version": "6.13.0",
- "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+ "integrity": "sha512-Eo0rcRaIDMld/W6mVhePiudIuLW+Cr/8eveW3mBREfZORScZgx4rh6BAPyvzdEc/JZvQ+LkC80t0VGFs6FX+lg==",
"dev": true
},
"node_modules/babel-plugin-syntax-flow": {
"version": "6.18.0",
- "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+ "integrity": "sha512-HbTDIoG1A1op7Tl/wIFQPULIBA61tsJ8Ntq2FAhLwuijrzosM/92kAfgU1Q3Kc7DH/cprJg5vDfuTY4QUL4rDA==",
"dev": true
},
"node_modules/babel-plugin-syntax-function-bind": {
"version": "6.13.0",
- "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+ "integrity": "sha512-m8yMoh9LIiNyeLdQs5I9G+3YXo4nqVsKQkk7YplrG4qAFbNi9hkZlow8HDHxhH9QOVFPHmy8+03NzRCdyChIKw==",
"dev": true
},
"node_modules/babel-plugin-syntax-jsx": {
"version": "6.18.0",
- "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+ "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
"dev": true
},
"node_modules/babel-plugin-syntax-object-rest-spread": {
"version": "6.13.0",
- "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+ "integrity": "sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w=="
},
"node_modules/babel-plugin-syntax-trailing-function-commas": {
"version": "6.22.0",
- "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+ "integrity": "sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ==",
"dev": true
},
"node_modules/babel-plugin-transform-async-generator-functions": {
"version": "6.24.1",
- "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+ "integrity": "sha512-uT7eovUxtXe8Q2ufcjRuJIOL0hg6VAUJhiWJBLxH/evYAw+aqoJLcYTR8hqx13iOx/FfbCMHgBmXWZjukbkyPg==",
"dev": true,
"dependencies": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -796,7 +851,7 @@
},
"node_modules/babel-plugin-transform-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+ "integrity": "sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw==",
"dev": true,
"dependencies": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -806,7 +861,7 @@
},
"node_modules/babel-plugin-transform-class-constructor-call": {
"version": "6.24.1",
- "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+ "integrity": "sha512-RvYukT1Nh7njz8P8326ztpQUGCKwmjgu6aRIx1lkvylWITYcskg29vy1Kp8WXIq7FvhXsz0Crf2kS94bjB690A==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-class-constructor-call": "^6.18.0",
@@ -816,7 +871,7 @@
},
"node_modules/babel-plugin-transform-class-properties": {
"version": "6.24.1",
- "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+ "integrity": "sha512-n4jtBA3OYBdvG5PRMKsMXJXHfLYw/ZOmtxCLOOwz6Ro5XlrColkStLnz1AS1L2yfPA9BKJ1ZNlmVCLjAL9DSIg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -827,7 +882,7 @@
},
"node_modules/babel-plugin-transform-decorators": {
"version": "6.24.1",
- "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+ "integrity": "sha512-skQ2CImwDkCHu0mkWvCOlBCpBIHW4/49IZWVwV4A/EnWjL9bB6UBvLyMNe3Td5XDStSZNhe69j4bfEW8dvUbew==",
"dev": true,
"dependencies": {
"babel-helper-explode-class": "^6.24.1",
@@ -839,7 +894,7 @@
},
"node_modules/babel-plugin-transform-do-expressions": {
"version": "6.22.0",
- "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+ "integrity": "sha512-yQwYqYg+Tnj1InA8W1rsItsZVhkv1Euc4KVua9ledtPz5PDWYz7LVyy6rDBpVYUWFZj5k6GUm3YZpCbIm8Tqew==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-do-expressions": "^6.8.0",
@@ -848,7 +903,7 @@
},
"node_modules/babel-plugin-transform-es2015-arrow-functions": {
"version": "6.22.0",
- "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+ "integrity": "sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -856,7 +911,7 @@
},
"node_modules/babel-plugin-transform-es2015-block-scoped-functions": {
"version": "6.22.0",
- "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+ "integrity": "sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -864,7 +919,7 @@
},
"node_modules/babel-plugin-transform-es2015-block-scoping": {
"version": "6.26.0",
- "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+ "integrity": "sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -876,7 +931,7 @@
},
"node_modules/babel-plugin-transform-es2015-classes": {
"version": "6.24.1",
- "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+ "integrity": "sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==",
"dev": true,
"dependencies": {
"babel-helper-define-map": "^6.24.1",
@@ -892,7 +947,7 @@
},
"node_modules/babel-plugin-transform-es2015-computed-properties": {
"version": "6.24.1",
- "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+ "integrity": "sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -901,7 +956,7 @@
},
"node_modules/babel-plugin-transform-es2015-destructuring": {
"version": "6.23.0",
- "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+ "integrity": "sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -909,7 +964,7 @@
},
"node_modules/babel-plugin-transform-es2015-duplicate-keys": {
"version": "6.24.1",
- "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+ "integrity": "sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -918,7 +973,7 @@
},
"node_modules/babel-plugin-transform-es2015-for-of": {
"version": "6.23.0",
- "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+ "integrity": "sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -926,7 +981,7 @@
},
"node_modules/babel-plugin-transform-es2015-function-name": {
"version": "6.24.1",
- "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+ "integrity": "sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -936,7 +991,7 @@
},
"node_modules/babel-plugin-transform-es2015-literals": {
"version": "6.22.0",
- "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+ "integrity": "sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -944,7 +999,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-amd": {
"version": "6.24.1",
- "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+ "integrity": "sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==",
"dev": true,
"dependencies": {
"babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
@@ -965,7 +1020,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-systemjs": {
"version": "6.24.1",
- "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+ "integrity": "sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==",
"dev": true,
"dependencies": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -975,7 +1030,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-umd": {
"version": "6.24.1",
- "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+ "integrity": "sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==",
"dev": true,
"dependencies": {
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
@@ -985,7 +1040,7 @@
},
"node_modules/babel-plugin-transform-es2015-object-super": {
"version": "6.24.1",
- "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+ "integrity": "sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==",
"dev": true,
"dependencies": {
"babel-helper-replace-supers": "^6.24.1",
@@ -994,7 +1049,7 @@
},
"node_modules/babel-plugin-transform-es2015-parameters": {
"version": "6.24.1",
- "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+ "integrity": "sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==",
"dev": true,
"dependencies": {
"babel-helper-call-delegate": "^6.24.1",
@@ -1007,7 +1062,7 @@
},
"node_modules/babel-plugin-transform-es2015-shorthand-properties": {
"version": "6.24.1",
- "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+ "integrity": "sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -1016,7 +1071,7 @@
},
"node_modules/babel-plugin-transform-es2015-spread": {
"version": "6.22.0",
- "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+ "integrity": "sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1024,7 +1079,7 @@
},
"node_modules/babel-plugin-transform-es2015-sticky-regex": {
"version": "6.24.1",
- "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+ "integrity": "sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ==",
"dev": true,
"dependencies": {
"babel-helper-regex": "^6.24.1",
@@ -1034,7 +1089,7 @@
},
"node_modules/babel-plugin-transform-es2015-template-literals": {
"version": "6.22.0",
- "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+ "integrity": "sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1042,7 +1097,7 @@
},
"node_modules/babel-plugin-transform-es2015-typeof-symbol": {
"version": "6.23.0",
- "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+ "integrity": "sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1050,7 +1105,7 @@
},
"node_modules/babel-plugin-transform-es2015-unicode-regex": {
"version": "6.24.1",
- "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+ "integrity": "sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ==",
"dev": true,
"dependencies": {
"babel-helper-regex": "^6.24.1",
@@ -1060,7 +1115,7 @@
},
"node_modules/babel-plugin-transform-exponentiation-operator": {
"version": "6.24.1",
- "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+ "integrity": "sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ==",
"dev": true,
"dependencies": {
"babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
@@ -1070,7 +1125,7 @@
},
"node_modules/babel-plugin-transform-export-extensions": {
"version": "6.22.0",
- "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+ "integrity": "sha512-mtzELzINaYqdVglyZrDDVwkcFRuE7s6QUFWXxwffKAHB/NkfbJ2NJSytugB43ytIC8UVt30Ereyx+7gNyTkDLg==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-export-extensions": "^6.8.0",
@@ -1079,7 +1134,7 @@
},
"node_modules/babel-plugin-transform-flow-strip-types": {
"version": "6.22.0",
- "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+ "integrity": "sha512-TxIM0ZWNw9oYsoTthL3lvAK3+eTujzktoXJg4ubGvICGbVuXVYv5hHv0XXpz8fbqlJaGYY4q5SVzaSmsg3t4Fg==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-flow": "^6.18.0",
@@ -1088,7 +1143,7 @@
},
"node_modules/babel-plugin-transform-function-bind": {
"version": "6.22.0",
- "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+ "integrity": "sha512-9Ec4KYf1GurT39mlUjDSlN7HWSlB3u3mWRMogQbb+Y88lO0ZM3rJ0ADhPnQwWK9TbO6e/4E+Et1rrfGY9mFimA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-function-bind": "^6.8.0",
@@ -1097,7 +1152,7 @@
},
"node_modules/babel-plugin-transform-object-rest-spread": {
"version": "6.26.0",
- "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+ "integrity": "sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-object-rest-spread": "^6.8.0",
@@ -1106,7 +1161,7 @@
},
"node_modules/babel-plugin-transform-react-display-name": {
"version": "6.25.0",
- "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+ "integrity": "sha512-QLYkLiZeeED2PKd4LuXGg5y9fCgPB5ohF8olWUuETE2ryHNRqqnXlEVP7RPuef89+HTfd3syptMGVHeoAu0Wig==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1114,7 +1169,7 @@
},
"node_modules/babel-plugin-transform-react-jsx": {
"version": "6.24.1",
- "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+ "integrity": "sha512-s+q/Y2u2OgDPHRuod3t6zyLoV8pUHc64i/O7ZNgIOEdYTq+ChPeybcKBi/xk9VI60VriILzFPW+dUxAEbTxh2w==",
"dev": true,
"dependencies": {
"babel-helper-builder-react-jsx": "^6.24.1",
@@ -1124,7 +1179,7 @@
},
"node_modules/babel-plugin-transform-react-jsx-self": {
"version": "6.22.0",
- "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+ "integrity": "sha512-Y3ZHP1nunv0U1+ysTNwLK39pabHj6cPVsfN4TRC7BDBfbgbyF4RifP5kd6LnbuMV9wcfedQMe7hn1fyKc7IzTQ==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -1133,7 +1188,7 @@
},
"node_modules/babel-plugin-transform-react-jsx-source": {
"version": "6.22.0",
- "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+ "integrity": "sha512-pcDNDsZ9q/6LJmujQ/OhjeoIlp5Nl546HJ2yiFIJK3mYpgNXhI5/S9mXfVxu5yqWAi7HdI7e/q6a9xtzwL69Vw==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -1142,7 +1197,7 @@
},
"node_modules/babel-plugin-transform-regenerator": {
"version": "6.26.0",
- "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+ "integrity": "sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg==",
"dev": true,
"dependencies": {
"regenerator-transform": "^0.10.0"
@@ -1150,7 +1205,7 @@
},
"node_modules/babel-plugin-transform-strict-mode": {
"version": "6.24.1",
- "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+ "integrity": "sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -1159,12 +1214,12 @@
},
"node_modules/babel-plugin-typecheck": {
"version": "1.3.0",
- "integrity": "sha1-SQhlLTGLDLICjrBhbmXyXMVkrpM=",
+ "integrity": "sha512-lb3F7nd0tzaP12NRrBFG3liOIyugyaIaJwyz/rPgjOA0OgN5qdRoIrdxcFWFaxqO9OKVgLthy84vkSqYSSFJLg==",
"dev": true
},
"node_modules/babel-polyfill": {
"version": "6.26.0",
- "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+ "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
"dependencies": {
"babel-runtime": "^6.26.0",
"core-js": "^2.5.0",
@@ -1173,7 +1228,7 @@
},
"node_modules/babel-preset-es2015": {
"version": "6.24.1",
- "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+ "integrity": "sha512-XfwUqG1Ry6R43m4Wfob+vHbIVBIqTg/TJY4Snku1iIzeH7mUnwHA8Vagmv+ZQbPwhS8HgsdQvy28Py3k5zpoFQ==",
"deprecated": "🙌 Thanks for using Babel: we recommend using babel-preset-env now: please read https://babeljs.io/env to update!",
"dev": true,
"dependencies": {
@@ -1205,7 +1260,7 @@
},
"node_modules/babel-preset-flow": {
"version": "6.23.0",
- "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+ "integrity": "sha512-PQZFJXnM3d80Vq4O67OE6EMVKIw2Vmzy8UXovqulNogCtblWU8rzP7Sm5YgHiCg4uejUxzCkHfNXQ4Z6GI+Dhw==",
"dev": true,
"dependencies": {
"babel-plugin-transform-flow-strip-types": "^6.22.0"
@@ -1213,14 +1268,14 @@
},
"node_modules/babel-preset-jest": {
"version": "19.0.0",
- "integrity": "sha1-ItZyAdAjJKGVgRKI6zgpS7PKw5Y=",
+ "integrity": "sha512-Jb+X0+98UWEuPQdZSGHC9ZKkngeIcpc9MKAM51Ze9GFJnpBuk7u9qDbN2Irh7JwZA3lc/MQ4I/RyObSqDFMbpw==",
"dependencies": {
"babel-plugin-jest-hoist": "^19.0.0"
}
},
"node_modules/babel-preset-react": {
"version": "6.24.1",
- "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+ "integrity": "sha512-phQe3bElbgF887UM0Dhz55d22ob8czTL1kbhZFwpCE6+R/X9kHktfwmx9JZb+bBSVRGphP5tZ9oWhVhlgjrX3Q==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.3.13",
@@ -1233,7 +1288,7 @@
},
"node_modules/babel-preset-stage-0": {
"version": "6.24.1",
- "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
+ "integrity": "sha512-MJD+xBbpsApbKlzAX0sOBF+VeFaUmv5s8FSOO7SSZpes1QgphCjq/UIGRFWSmQ/0i5bqQjLGCTXGGXqcLQ9JDA==",
"dev": true,
"dependencies": {
"babel-plugin-transform-do-expressions": "^6.22.0",
@@ -1243,7 +1298,7 @@
},
"node_modules/babel-preset-stage-1": {
"version": "6.24.1",
- "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+ "integrity": "sha512-rn+UOcd7BHDniq1SVxv2/AVVSVI1NK+hfS0I/iR6m6KbOi/aeBRcqBilqO73pd9VUpRXF2HFtlDuC9F2BEQqmg==",
"dev": true,
"dependencies": {
"babel-plugin-transform-class-constructor-call": "^6.24.1",
@@ -1253,7 +1308,7 @@
},
"node_modules/babel-preset-stage-2": {
"version": "6.24.1",
- "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+ "integrity": "sha512-9F+nquz+37PrlTSBdpeQBKnQfAMNBnryXw+m4qBh35FNbJPfzZz+sjN2G5Uf1CRedU9PH7fJkTbYijxmkLX8Og==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -1264,7 +1319,7 @@
},
"node_modules/babel-preset-stage-3": {
"version": "6.24.1",
- "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+ "integrity": "sha512-eCbEOF8uN0KypFXJmZXn2sTk7bPV9uM5xov7G/7BM08TbQEObsVs0cEWfy6NQySlfk7JBi/t+XJP1JkruYfthA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -1276,7 +1331,7 @@
},
"node_modules/babel-register": {
"version": "6.26.0",
- "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+ "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
"dependencies": {
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
@@ -1289,7 +1344,7 @@
},
"node_modules/babel-runtime": {
"version": "6.26.0",
- "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
"dependencies": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
@@ -1301,7 +1356,7 @@
},
"node_modules/babel-template": {
"version": "6.26.0",
- "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+ "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
"dependencies": {
"babel-runtime": "^6.26.0",
"babel-traverse": "^6.26.0",
@@ -1312,7 +1367,7 @@
},
"node_modules/babel-traverse": {
"version": "6.26.0",
- "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+ "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
"dependencies": {
"babel-code-frame": "^6.26.0",
"babel-messages": "^6.23.0",
@@ -1327,7 +1382,7 @@
},
"node_modules/babel-types": {
"version": "6.26.0",
- "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+ "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
"dependencies": {
"babel-runtime": "^6.26.0",
"esutils": "^2.0.2",
@@ -1344,7 +1399,7 @@
},
"node_modules/balanced-match": {
"version": "0.2.1",
- "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
+ "integrity": "sha512-euSOvfze1jPOf85KQOmZ2UcWDJ/dUJukTJdj4o9ZZLyjl7IjdIyE4fAQRSuGrxAjB9nvvvrl4N3bPtRq+W+SyQ==",
"dev": true
},
"node_modules/base": {
@@ -1366,7 +1421,7 @@
},
"node_modules/base/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dev": true,
"dependencies": {
"is-descriptor": "^1.0.0"
@@ -1377,7 +1432,7 @@
},
"node_modules/base/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -1404,12 +1459,12 @@
},
"node_modules/batch": {
"version": "0.6.1",
- "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
"dev": true
},
"node_modules/bcrypt-pbkdf": {
"version": "1.0.2",
- "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
"dev": true,
"dependencies": {
"tweetnacl": "^0.14.3"
@@ -1433,30 +1488,33 @@
},
"node_modules/blacklist": {
"version": "1.1.4",
- "integrity": "sha1-st0J1hd2JbLKppg1o3somV+povI="
+ "integrity": "sha512-DWdfwimA1WQxVC69Vs1Fy525NbYwisMSCdYQmW9zyzOByz9OB/tQwrKZ3T3pbTkuFjnkJFlJuyiDjPiXL5kzew=="
},
"node_modules/bluebird": {
"version": "3.7.2",
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
},
"node_modules/body-parser": {
- "version": "1.19.2",
- "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+ "version": "1.20.1",
+ "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "http-errors": "1.8.1",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
- "on-finished": "~2.3.0",
- "qs": "6.9.7",
- "raw-body": "2.4.3",
- "type-is": "~1.6.18"
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
},
"engines": {
- "node": ">= 0.8"
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
}
},
"node_modules/body-parser/node_modules/bytes": {
@@ -1479,9 +1537,12 @@
}
},
"node_modules/body-parser/node_modules/qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+ "version": "6.11.0",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
"engines": {
"node": ">=0.6"
},
@@ -1491,7 +1552,7 @@
},
"node_modules/boom": {
"version": "2.10.1",
- "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+ "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -1524,7 +1585,7 @@
},
"node_modules/braces": {
"version": "1.8.5",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
"dependencies": {
"expand-range": "^1.8.1",
"preserve": "^0.2.0",
@@ -1536,7 +1597,7 @@
},
"node_modules/browser-request": {
"version": "0.3.3",
- "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=",
+ "integrity": "sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==",
"dev": true,
"engines": [
"node"
@@ -1544,7 +1605,7 @@
},
"node_modules/browserify-aes": {
"version": "0.4.0",
- "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
+ "integrity": "sha512-hnvbMhZ/Ete34qnoKKyjikiYQfZbl89d5UZ29cz3EG13cv/8VRyM8Zs84luB/O7BRzC3qSng9dVovJ6jghcAvg==",
"dev": true,
"dependencies": {
"inherits": "^2.0.1"
@@ -1552,7 +1613,7 @@
},
"node_modules/browserify-zlib": {
"version": "0.1.4",
- "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+ "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
"dev": true,
"dependencies": {
"pako": "~0.2.0"
@@ -1560,12 +1621,12 @@
},
"node_modules/browserify-zlib/node_modules/pako": {
"version": "0.2.9",
- "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+ "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
"dev": true
},
"node_modules/browserslist": {
"version": "0.4.0",
- "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=",
+ "integrity": "sha512-/JVhaf9S6ru3THyiuwX5j86pT79r5UtgwV3s6w+KpGlmUzPxfMbI5OBxO88iFtqgdqPuNirprachS3m1611qKA==",
"deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
"dev": true,
"dependencies": {
@@ -1596,12 +1657,12 @@
},
"node_modules/builtin-status-codes": {
"version": "3.0.0",
- "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
"dev": true
},
"node_modules/bytes": {
"version": "3.0.0",
- "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+ "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -1627,13 +1688,13 @@
}
},
"node_modules/cacache/node_modules/glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
},
@@ -1665,33 +1726,45 @@
},
"node_modules/cache-base/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/call-bind": {
+ "version": "1.0.2",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "dev": true,
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/camelcase": {
"version": "1.2.1",
- "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+ "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/caniuse-db": {
- "version": "1.0.30001312",
- "integrity": "sha512-4eJfCSGxsF9JcQXBLdHclxkpLWv+Va7Y6QESYCWSdrR8b8x16TxUjCoOK/kU7SFC0BdcuK0nvt6ZkM59Q03LjQ==",
+ "version": "1.0.30001546",
+ "integrity": "sha512-tHZtms21kyl2dfwld0YkyIT0EYxcE3FJqb43nHoPqZj4fT3YsIAgrQQbyIoXL+jM5p56EgO+o564gjUdMcC4lQ==",
"dev": true
},
"node_modules/caseless": {
"version": "0.12.0",
- "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
"dev": true
},
"node_modules/center-align": {
"version": "0.1.3",
- "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+ "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
"dev": true,
"dependencies": {
"align-text": "^0.1.3",
@@ -1703,7 +1776,7 @@
},
"node_modules/chalk": {
"version": "1.1.3",
- "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
"dependencies": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
@@ -1717,7 +1790,7 @@
},
"node_modules/chokidar": {
"version": "1.7.0",
- "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+ "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
"deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
"dev": true,
"dependencies": {
@@ -1754,7 +1827,7 @@
},
"node_modules/class-utils/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dev": true,
"dependencies": {
"is-descriptor": "^0.1.0"
@@ -1765,7 +1838,7 @@
},
"node_modules/class-utils/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -1776,7 +1849,7 @@
},
"node_modules/class-utils/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -1808,19 +1881,19 @@
},
"node_modules/class-utils/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/classnames": {
- "version": "2.3.1",
- "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+ "version": "2.3.2",
+ "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
},
"node_modules/cli-table": {
"version": "0.0.2",
- "integrity": "sha1-mChn4WQ1Mlxmwgih5xuVM26jCTs=",
+ "integrity": "sha512-pxlO2LG8dJMt+xR33zeICgkCje4SSueapy+FW7VjtD9HEUdOj7gl8lNCjCUWa9H4M3ao0ys/1kjLv86KY4tWmA==",
"dev": true,
"dependencies": {
"colors": "0.3.0"
@@ -1831,7 +1904,7 @@
},
"node_modules/cliui": {
"version": "2.1.0",
- "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+ "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
"dev": true,
"dependencies": {
"center-align": "^0.1.1",
@@ -1841,7 +1914,7 @@
},
"node_modules/cliui/node_modules/wordwrap": {
"version": "0.0.2",
- "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+ "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
"dev": true,
"engines": {
"node": ">=0.4.0"
@@ -1849,7 +1922,7 @@
},
"node_modules/clone": {
"version": "1.0.4",
- "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+ "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
"dev": true,
"engines": {
"node": ">=0.8"
@@ -1857,7 +1930,7 @@
},
"node_modules/co": {
"version": "4.6.0",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+ "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
"dev": true,
"optional": true,
"engines": {
@@ -1880,7 +1953,7 @@
},
"node_modules/collection-visit": {
"version": "1.0.0",
- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+ "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
"dev": true,
"dependencies": {
"map-visit": "^1.0.0",
@@ -1892,7 +1965,7 @@
},
"node_modules/color": {
"version": "0.10.1",
- "integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
+ "integrity": "sha512-MGvoNNG3vGqFdWjEaj4/6aPqfzLEIlN30YEuSDRaJMujUMx7KTdizi1VzkGnp8Q+nX031k7BnbLv5q7ZkcN14A==",
"dev": true,
"dependencies": {
"color-convert": "^0.5.3",
@@ -1901,7 +1974,7 @@
},
"node_modules/color-convert": {
"version": "0.5.3",
- "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+ "integrity": "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling==",
"dev": true
},
"node_modules/color-name": {
@@ -1911,7 +1984,7 @@
},
"node_modules/color-string": {
"version": "0.3.0",
- "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+ "integrity": "sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==",
"dev": true,
"dependencies": {
"color-name": "^1.0.0"
@@ -1919,7 +1992,7 @@
},
"node_modules/colormin": {
"version": "1.1.2",
- "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+ "integrity": "sha512-XSEQUUQUR/lXqGyddiNH3XYFUPYlYr1vXy9rTFMsSOw+J7Q6EQkdlQIrTlYn4TccpsOaUE1PYQNjBn20gwCdgQ==",
"dev": true,
"dependencies": {
"color": "^0.11.0",
@@ -1929,7 +2002,7 @@
},
"node_modules/colormin/node_modules/color": {
"version": "0.11.4",
- "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+ "integrity": "sha512-Ajpjd8asqZ6EdxQeqGzU5WBhhTfJ/0cA4Wlbre7e5vXfmDSmda7Ov6jeKoru+b0vHcb1CqvuroTHp5zIWzhVMA==",
"dev": true,
"dependencies": {
"clone": "^1.0.2",
@@ -1947,12 +2020,12 @@
},
"node_modules/colormin/node_modules/color-name": {
"version": "1.1.3",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"dev": true
},
"node_modules/colors": {
"version": "0.3.0",
- "integrity": "sha1-wkfWTTTbDKTcjkPz7NbamNCvlOc=",
+ "integrity": "sha512-zRIkNRjxdyFV2Vuq0Bh8hL/rWgQsBM19aB6Uq9CMot2olUuD1DEPon9SB3GZNDrfOojb6a74AQhSM5BKrAr9tA==",
"dev": true,
"engines": {
"node": "*"
@@ -1975,7 +2048,7 @@
},
"node_modules/commondir": {
"version": "1.0.1",
- "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
},
"node_modules/component-emitter": {
"version": "1.3.0",
@@ -2010,9 +2083,14 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/compression/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/concat-map": {
"version": "0.0.1",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"node_modules/concat-stream": {
"version": "1.6.2",
@@ -2028,8 +2106,8 @@
}
},
"node_modules/concat-stream/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -2040,6 +2118,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/concat-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/concat-stream/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -2062,7 +2144,7 @@
},
"node_modules/constants-browserify": {
"version": "1.0.0",
- "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
"dev": true
},
"node_modules/content-disposition": {
@@ -2076,43 +2158,21 @@
"node": ">= 0.6"
}
},
- "node_modules/content-disposition/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/content-type": {
- "version": "1.0.4",
- "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+ "version": "1.0.5",
+ "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
"dev": true,
"engines": {
"node": ">= 0.6"
}
},
"node_modules/convert-source-map": {
- "version": "1.8.0",
- "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "dependencies": {
- "safe-buffer": "~5.1.1"
- }
+ "version": "1.9.0",
+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
},
"node_modules/cookie": {
- "version": "0.4.2",
- "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+ "version": "0.5.0",
+ "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -2120,7 +2180,7 @@
},
"node_modules/cookie-signature": {
"version": "1.0.6",
- "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true
},
"node_modules/copy-concurrently": {
@@ -2137,7 +2197,7 @@
},
"node_modules/copy-descriptor": {
"version": "0.1.1",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+ "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -2146,16 +2206,16 @@
"node_modules/core-js": {
"version": "2.6.12",
"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
- "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
"hasInstallScript": true
},
"node_modules/core-util-is": {
"version": "1.0.2",
- "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
},
"node_modules/cover": {
"version": "0.2.9",
- "integrity": "sha1-JiAp37MXFNSAQ/7ZHt5lhZOVXdQ=",
+ "integrity": "sha512-ezch+ax5tw9w+9NDdh65VoMrfM8HfT7l/Tys8G4QQw58Yj7PeJ8DlBKDmV9cZuEUuoBoy4rdjVXKClrh8o6A1g==",
"dev": true,
"dependencies": {
"cli-table": "0.0.x",
@@ -2169,7 +2229,7 @@
},
"node_modules/cover/node_modules/which": {
"version": "1.0.9",
- "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
+ "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
"dev": true,
"bin": {
"which": "bin/which"
@@ -2185,7 +2245,7 @@
},
"node_modules/cryptiles": {
"version": "2.0.5",
- "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+ "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -2198,7 +2258,7 @@
},
"node_modules/crypto-browserify": {
"version": "3.3.0",
- "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
+ "integrity": "sha512-9n5nGl6D8zb29Ui8Ji8pVdUIE3RUe6A9zQf2iLPjFKftnkkkJBCGb7TkYAFNjt9nfsvZTLL52CwxzS9Tw7Bujw==",
"dev": true,
"dependencies": {
"browserify-aes": "0.4.0",
@@ -2212,7 +2272,7 @@
},
"node_modules/css-color-names": {
"version": "0.0.4",
- "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+ "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
"dev": true,
"engines": {
"node": "*"
@@ -2220,13 +2280,13 @@
},
"node_modules/css-list": {
"version": "0.1.3",
- "integrity": "sha1-p7M7RBn4PUEjIN3pEzoNEASUjXA=",
+ "integrity": "sha512-/ckGMggH8coLFPTyCLEPP0mlHAjTTdPNO/AcTMGhDvlOypkcYL3pA8U5hR+7poKsSfmVgSvg7XfC9WGvXzBQww==",
"deprecated": "Deprecated.",
"dev": true
},
"node_modules/css-loader": {
"version": "0.15.6",
- "integrity": "sha1-Iofe4oSCnr+4H6wLKU2nKbO/oUQ=",
+ "integrity": "sha512-DgyAT/6ss+muCMexkvwFJQImpCH7SAp5d59uQk8HtUG8ZUn6jyJ0HA8ncnIzHoUPRLlJkuSdtd5Hay+PxtcIjw==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.1",
@@ -2241,7 +2301,7 @@
},
"node_modules/css-selector-tokenizer": {
"version": "0.5.4",
- "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=",
+ "integrity": "sha512-4KF0VPHT7x/rSPnmUJ/wSzx1AVRnQAUVcuHJnlR2vo8ZKKp1oSh77iD7S/0PSwvMlBIdre0cTeFwWKvq7pn3KA==",
"dev": true,
"dependencies": {
"cssesc": "^0.1.0",
@@ -2250,7 +2310,7 @@
},
"node_modules/cssesc": {
"version": "0.1.0",
- "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+ "integrity": "sha512-72avb2vCIsNDBlSMYuxt2Cmg6Z4TTGqifblGs7IXGihhuEzghCb9Pu1Y6vzVPLC03OTXnAKsTm92ChZd4uzVBQ==",
"dev": true,
"bin": {
"cssesc": "bin/cssesc"
@@ -2258,7 +2318,7 @@
},
"node_modules/cssnano": {
"version": "2.6.1",
- "integrity": "sha1-f7NyEsz/RNPpNuAmxvZ14xR9gCQ=",
+ "integrity": "sha512-u3L8MNOBSP78DxKgVT6Gor04Cl6+S/XR/lMVHX0EzVU1tmOwHKtKd0LuXK17EhU/Y3TfFHgCyaJAV8rIy/7gNw==",
"dev": true,
"dependencies": {
"autoprefixer-core": "^5.2.1",
@@ -2303,19 +2363,19 @@
},
"node_modules/cssstyle": {
"version": "0.2.37",
- "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+ "integrity": "sha512-FUpKc+1FNBsHUr9IsfSGCovr8VuGOiiuzlgCyppKBjJi2jYTOFLN3oiiNRMIvYqbFzF38mqKj4BgcevzU5/kIA==",
"dev": true,
"dependencies": {
"cssom": "0.3.x"
}
},
"node_modules/cyclist": {
- "version": "1.0.1",
- "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+ "version": "1.0.2",
+ "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="
},
"node_modules/dashdash": {
"version": "1.14.1",
- "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0"
@@ -2333,15 +2393,15 @@
},
"node_modules/decamelize": {
"version": "1.2.0",
- "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/decode-uri-component": {
- "version": "0.2.0",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+ "version": "0.2.2",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"dev": true,
"engines": {
"node": ">=0.10"
@@ -2349,7 +2409,7 @@
},
"node_modules/deep-diff": {
"version": "0.3.4",
- "integrity": "sha1-qsXDmVIjar5fA3ojSQYLoBsArkg=",
+ "integrity": "sha512-Q2QODPwxBnMRbT8tUw1afL8PRY4mbMlJDU6HnLnDBNl/sAatNDG5vyk1pRt2bv3i60OY7X9ETXrH80SWX939EA==",
"dev": true
},
"node_modules/deep-is": {
@@ -2357,6 +2417,35 @@
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true
},
+ "node_modules/define-data-property": {
+ "version": "1.1.0",
+ "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+ "dev": true,
+ "dependencies": {
+ "get-intrinsic": "^1.2.1",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/define-properties": {
+ "version": "1.2.1",
+ "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+ "dev": true,
+ "dependencies": {
+ "define-data-property": "^1.0.1",
+ "has-property-descriptors": "^1.0.0",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/define-property": {
"version": "2.0.2",
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
@@ -2371,46 +2460,54 @@
},
"node_modules/define-property/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/defined": {
- "version": "1.0.0",
- "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
- "dev": true
+ "version": "1.0.1",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/delayed-stream": {
"version": "1.0.0",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
"dev": true,
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/depd": {
- "version": "1.1.2",
- "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "version": "2.0.0",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
"dev": true,
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/destroy": {
- "version": "1.0.4",
- "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
- "dev": true
+ "version": "1.2.0",
+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
},
"node_modules/detect-hover": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-hover/-/detect-hover-1.0.3.tgz",
"integrity": "sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==",
"dev": true
},
"node_modules/detect-indent": {
"version": "4.0.0",
- "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+ "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
"dependencies": {
"repeating": "^2.0.0"
},
@@ -2420,7 +2517,8 @@
},
"node_modules/detect-it": {
"version": "2.1.1",
- "integrity": "sha1-39tgv/CX3p6+c2YgHFNQ1ODWQiU=",
+ "resolved": "https://registry.npmjs.org/detect-it/-/detect-it-2.1.1.tgz",
+ "integrity": "sha512-ZBC+LVUG18aBmw4JRakDM5fI7kYcsbwpJTVuU6za7cWRfyzzhVbIWZVayGnon1xFeIGxFN3jiZ8QON3YteUyCw==",
"dev": true,
"dependencies": {
"detect-hover": "^1.0.1",
@@ -2431,22 +2529,25 @@
},
"node_modules/detect-passive-events": {
"version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/detect-passive-events/-/detect-passive-events-1.0.5.tgz",
"integrity": "sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==",
"dev": true
},
"node_modules/detect-pointer": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-pointer/-/detect-pointer-1.0.3.tgz",
"integrity": "sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==",
"dev": true
},
"node_modules/detect-touch-events": {
"version": "1.0.1",
- "integrity": "sha1-EVWEqrdAnAuS3xA6sPv1KFzVDXE=",
+ "resolved": "https://registry.npmjs.org/detect-touch-events/-/detect-touch-events-1.0.1.tgz",
+ "integrity": "sha512-ZYSP1bEs68q4fICiaTepdEjwBR4Ybg7rCQfMySP5IrO3V+7smmaqVjcvQdo+wENCQT/rdEWnB+E+ugIq4s1TdA==",
"dev": true
},
"node_modules/diff": {
"version": "2.2.3",
- "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+ "integrity": "sha512-9wfm3RLzMp/PyTFWuw9liEzdlxsdGixCW0ZTU1XDmtlAkvpVXTPGF8KnfSs0hm3BPbg19OrUPPsRkHXoREpP1g==",
"dev": true,
"engines": {
"node": ">=0.3.1"
@@ -2454,6 +2555,7 @@
},
"node_modules/docx": {
"version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/docx/-/docx-4.7.1.tgz",
"integrity": "sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw==",
"dev": true,
"dependencies": {
@@ -2485,8 +2587,8 @@
}
},
"node_modules/dom-serializer/node_modules/domelementtype": {
- "version": "2.2.0",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+ "version": "2.3.0",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
"dev": true,
"funding": [
{
@@ -2545,8 +2647,8 @@
}
},
"node_modules/duplexify/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -2557,6 +2659,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/duplexify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/duplexify/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -2566,7 +2672,7 @@
},
"node_modules/ecc-jsbn": {
"version": "0.1.2",
- "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
"dev": true,
"dependencies": {
"jsbn": "~0.1.0",
@@ -2575,16 +2681,16 @@
},
"node_modules/ee-first": {
"version": "1.1.1",
- "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
"dev": true
},
"node_modules/element-class": {
"version": "0.2.2",
- "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4="
+ "integrity": "sha512-e4tkRAFtQkGiZB8fzxAFdjEbx5zajMb1GpiRwKs3lhOLxQcvdOIG7XlERT1sTX3/ulIUGZrgL02YZ0cRNC5OLQ=="
},
"node_modules/emojis-list": {
"version": "2.1.0",
- "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+ "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
"dev": true,
"engines": {
"node": ">= 0.10"
@@ -2592,7 +2698,7 @@
},
"node_modules/encodeurl": {
"version": "1.0.2",
- "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -2614,7 +2720,7 @@
},
"node_modules/enhanced-resolve": {
"version": "0.9.1",
- "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+ "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.1.2",
@@ -2627,7 +2733,7 @@
},
"node_modules/enhanced-resolve/node_modules/memory-fs": {
"version": "0.2.0",
- "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
+ "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
"dev": true
},
"node_modules/entities": {
@@ -2654,24 +2760,24 @@
},
"node_modules/es6-promise": {
"version": "3.3.1",
- "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
+ "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
"dev": true
},
"node_modules/escape-html": {
"version": "1.0.3",
- "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
"dev": true
},
"node_modules/escape-string-regexp": {
"version": "1.0.5",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/escodegen": {
"version": "1.7.1",
- "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=",
+ "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
"dev": true,
"dependencies": {
"esprima": "^1.2.2",
@@ -2692,7 +2798,7 @@
},
"node_modules/escodegen/node_modules/esprima": {
"version": "1.2.5",
- "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=",
+ "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2704,7 +2810,7 @@
},
"node_modules/escodegen/node_modules/source-map": {
"version": "0.2.0",
- "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+ "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
"dev": true,
"optional": true,
"dependencies": {
@@ -2716,7 +2822,7 @@
},
"node_modules/esprima": {
"version": "2.5.0",
- "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=",
+ "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2728,7 +2834,7 @@
},
"node_modules/esprima-fb": {
"version": "4001.1001.0-dev-harmony-fb",
- "integrity": "sha1-9Qn2FuZtEcLFOWomHGGe3MtxKAo=",
+ "integrity": "sha512-TW7D+Ii7CDdaQqTG7uY0hrE9wm26sIzI+T7eoH9Z7bt6xJ8HDns0CXFjH5H3PP47j74h0ctNQd1QP0hw41+Bdw==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2740,7 +2846,7 @@
},
"node_modules/estraverse": {
"version": "1.9.3",
- "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+ "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -2755,7 +2861,7 @@
},
"node_modules/etag": {
"version": "1.8.1",
- "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -2768,21 +2874,18 @@
},
"node_modules/events": {
"version": "1.1.1",
- "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+ "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
"dev": true,
"engines": {
"node": ">=0.4.x"
}
},
"node_modules/eventsource": {
- "version": "1.1.0",
- "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
+ "version": "2.0.2",
+ "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
"dev": true,
- "dependencies": {
- "original": "^1.0.0"
- },
"engines": {
- "node": ">=0.12.0"
+ "node": ">=12.0.0"
}
},
"node_modules/exec-sh": {
@@ -2795,11 +2898,11 @@
},
"node_modules/exenv": {
"version": "1.2.2",
- "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+ "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
},
"node_modules/expand-brackets": {
"version": "0.1.5",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+ "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
"dependencies": {
"is-posix-bracket": "^0.1.0"
},
@@ -2809,7 +2912,7 @@
},
"node_modules/expand-range": {
"version": "1.8.2",
- "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+ "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
"dependencies": {
"fill-range": "^2.1.0"
},
@@ -2819,7 +2922,7 @@
},
"node_modules/exports-loader": {
"version": "0.6.4",
- "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=",
+ "integrity": "sha512-koRSTJrocXi3l7MKXSJPbNKUmewV2CewsWCZW+5KYxgkiZBjlEo4Z+DJuHDq4WzOi19drlyuT1xY7ADmwln8zQ==",
"dev": true,
"dependencies": {
"loader-utils": "^1.0.2",
@@ -2843,8 +2946,8 @@
}
},
"node_modules/exports-loader/node_modules/json5": {
- "version": "1.0.1",
- "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"dependencies": {
"minimist": "^1.2.0"
@@ -2854,8 +2957,8 @@
}
},
"node_modules/exports-loader/node_modules/loader-utils": {
- "version": "1.4.0",
- "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+ "version": "1.4.2",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
@@ -2867,37 +2970,38 @@
}
},
"node_modules/express": {
- "version": "4.17.3",
- "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+ "version": "4.18.2",
+ "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
"dev": true,
"dependencies": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.19.2",
+ "body-parser": "1.20.1",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.4.2",
+ "cookie": "0.5.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
- "finalhandler": "~1.1.2",
+ "finalhandler": "1.2.0",
"fresh": "0.5.2",
+ "http-errors": "2.0.0",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.7",
- "qs": "6.9.7",
+ "qs": "6.11.0",
"range-parser": "~1.2.1",
"safe-buffer": "5.2.1",
- "send": "0.17.2",
- "serve-static": "1.14.2",
+ "send": "0.18.0",
+ "serve-static": "1.15.0",
"setprototypeof": "1.2.0",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
@@ -2907,9 +3011,12 @@
}
},
"node_modules/express/node_modules/qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+ "version": "6.11.0",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
"engines": {
"node": ">=0.6"
},
@@ -2917,25 +3024,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/express/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/extend": {
"version": "3.0.2",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
@@ -2943,7 +3031,7 @@
},
"node_modules/extend-shallow": {
"version": "3.0.2",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
"dev": true,
"dependencies": {
"assign-symbols": "^1.0.0",
@@ -2966,7 +3054,7 @@
},
"node_modules/extglob": {
"version": "0.3.2",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+ "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
"dependencies": {
"is-extglob": "^1.0.0"
},
@@ -2976,7 +3064,7 @@
},
"node_modules/extsprintf": {
"version": "1.3.0",
- "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
"dev": true,
"engines": [
"node >=0.6.0"
@@ -2992,7 +3080,7 @@
},
"node_modules/fast-levenshtein": {
"version": "1.0.7",
- "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
+ "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
"dev": true
},
"node_modules/fastparse": {
@@ -3012,8 +3100,8 @@
}
},
"node_modules/fb-watchman": {
- "version": "2.0.1",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
"dev": true,
"dependencies": {
"bser": "2.1.1"
@@ -3034,8 +3122,8 @@
},
"node_modules/fbjs/node_modules/core-js": {
"version": "1.2.7",
- "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
- "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js."
+ "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js."
},
"node_modules/file-saver": {
"version": "2.0.2",
@@ -3045,14 +3133,14 @@
},
"node_modules/filename-regex": {
"version": "2.0.1",
- "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+ "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/fileset": {
"version": "0.2.1",
- "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
+ "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
"dev": true,
"dependencies": {
"glob": "5.x",
@@ -3061,7 +3149,7 @@
},
"node_modules/fileset/node_modules/minimatch": {
"version": "2.0.10",
- "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+ "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
"deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
"dev": true,
"dependencies": {
@@ -3086,16 +3174,16 @@
}
},
"node_modules/finalhandler": {
- "version": "1.1.2",
- "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+ "version": "1.2.0",
+ "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
"dev": true,
"dependencies": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"unpipe": "~1.0.0"
},
"engines": {
@@ -3104,7 +3192,7 @@
},
"node_modules/find-cache-dir": {
"version": "0.1.1",
- "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+ "integrity": "sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A==",
"dev": true,
"dependencies": {
"commondir": "^1.0.1",
@@ -3117,7 +3205,7 @@
},
"node_modules/find-up": {
"version": "1.1.2",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
"dependencies": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
@@ -3128,7 +3216,7 @@
},
"node_modules/flatten": {
"version": "0.0.1",
- "integrity": "sha1-VURAdm2goNYDmZ9DNFP2wvxqdcE=",
+ "integrity": "sha512-pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg==",
"deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
"dev": true,
"engines": {
@@ -3144,8 +3232,8 @@
}
},
"node_modules/flush-write-stream/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3156,6 +3244,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/flush-write-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/flush-write-stream/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -3164,8 +3256,8 @@
}
},
"node_modules/follow-redirects": {
- "version": "1.14.9",
- "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+ "version": "1.15.3",
+ "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
"dev": true,
"funding": [
{
@@ -3184,14 +3276,14 @@
},
"node_modules/for-in": {
"version": "1.0.2",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/for-own": {
"version": "0.1.5",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
"dependencies": {
"for-in": "^1.0.1"
},
@@ -3201,7 +3293,7 @@
},
"node_modules/forever-agent": {
"version": "0.6.1",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
"dev": true,
"engines": {
"node": "*"
@@ -3230,7 +3322,7 @@
},
"node_modules/fragment-cache": {
"version": "0.2.1",
- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+ "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
"dev": true,
"dependencies": {
"map-cache": "^0.2.2"
@@ -3241,7 +3333,7 @@
},
"node_modules/fresh": {
"version": "0.5.2",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -3249,15 +3341,15 @@
},
"node_modules/from2": {
"version": "2.3.0",
- "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
"dependencies": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.0"
}
},
"node_modules/from2/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3268,6 +3360,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/from2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/from2/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -3277,12 +3373,13 @@
},
"node_modules/fs": {
"version": "0.0.1-security",
- "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=",
+ "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+ "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
"dev": true
},
"node_modules/fs-extra": {
"version": "0.14.0",
- "integrity": "sha1-RmCWxroticIAA4DaskULeFn/Z0M=",
+ "integrity": "sha512-cfijsB8nt4C9wwYDyDqpALcCIk1Wxj/fhN5eVDRRbJxQTTWyyDAqhERmS60g9+WMaPoNaUAz4xQL71Dez05g+A==",
"dev": true,
"dependencies": {
"jsonfile": "^2.0.0",
@@ -3292,7 +3389,7 @@
},
"node_modules/fs-write-stream-atomic": {
"version": "1.0.10",
- "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+ "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
"dependencies": {
"graceful-fs": "^4.1.2",
"iferr": "^0.1.5",
@@ -3301,8 +3398,8 @@
}
},
"node_modules/fs-write-stream-atomic/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3313,6 +3410,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/fs-write-stream-atomic/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/fs-write-stream-atomic/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -3322,20 +3423,35 @@
},
"node_modules/fs.realpath": {
"version": "1.0.0",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/function-bind": {
"version": "1.1.1",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
},
"node_modules/gather-stream": {
"version": "1.0.0",
- "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+ "integrity": "sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==",
"dev": true
},
+ "node_modules/get-intrinsic": {
+ "version": "1.2.1",
+ "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+ "dev": true,
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/get-value": {
"version": "2.0.6",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3343,7 +3459,7 @@
},
"node_modules/getpass": {
"version": "0.1.7",
- "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0"
@@ -3351,7 +3467,7 @@
},
"node_modules/glob": {
"version": "5.0.15",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+ "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
"dev": true,
"dependencies": {
"inflight": "^1.0.4",
@@ -3366,7 +3482,7 @@
},
"node_modules/glob-base": {
"version": "0.3.0",
- "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+ "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
"dependencies": {
"glob-parent": "^2.0.0",
"is-glob": "^2.0.0"
@@ -3377,7 +3493,7 @@
},
"node_modules/glob-parent": {
"version": "2.0.0",
- "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+ "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
"dependencies": {
"is-glob": "^2.0.0"
}
@@ -3389,17 +3505,28 @@
"node": ">=0.10.0"
}
},
+ "node_modules/gopd": {
+ "version": "1.0.1",
+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+ "dev": true,
+ "dependencies": {
+ "get-intrinsic": "^1.1.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/graceful-fs": {
- "version": "4.2.9",
- "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+ "version": "4.2.11",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
},
"node_modules/handlebars": {
- "version": "4.7.7",
- "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+ "version": "4.7.8",
+ "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
"dev": true,
"dependencies": {
"minimist": "^1.2.5",
- "neo-async": "^2.6.0",
+ "neo-async": "^2.6.2",
"source-map": "^0.6.1",
"wordwrap": "^1.0.0"
},
@@ -3423,7 +3550,7 @@
},
"node_modules/har-schema": {
"version": "2.0.0",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
"dev": true,
"engines": {
"node": ">=4"
@@ -3443,18 +3570,15 @@
}
},
"node_modules/has": {
- "version": "1.0.3",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dependencies": {
- "function-bind": "^1.1.1"
- },
+ "version": "1.0.4",
+ "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
"engines": {
"node": ">= 0.4.0"
}
},
"node_modules/has-ansi": {
"version": "2.0.0",
- "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
"dependencies": {
"ansi-regex": "^2.0.0"
},
@@ -3464,15 +3588,48 @@
},
"node_modules/has-flag": {
"version": "1.0.0",
- "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+ "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/has-property-descriptors": {
+ "version": "1.0.0",
+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+ "dev": true,
+ "dependencies": {
+ "get-intrinsic": "^1.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-proto": {
+ "version": "1.0.1",
+ "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.0.3",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/has-value": {
"version": "1.0.0",
- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+ "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
"dev": true,
"dependencies": {
"get-value": "^2.0.6",
@@ -3485,7 +3642,7 @@
},
"node_modules/has-value/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3493,7 +3650,7 @@
},
"node_modules/has-values": {
"version": "1.0.0",
- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+ "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
"dev": true,
"dependencies": {
"is-number": "^3.0.0",
@@ -3505,7 +3662,7 @@
},
"node_modules/has-values/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -3516,7 +3673,7 @@
},
"node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dev": true,
"dependencies": {
"is-buffer": "^1.1.5"
@@ -3527,7 +3684,7 @@
},
"node_modules/has-values/node_modules/kind-of": {
"version": "4.0.0",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+ "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
"dev": true,
"dependencies": {
"is-buffer": "^1.1.5"
@@ -3538,7 +3695,7 @@
},
"node_modules/hawk": {
"version": "3.1.3",
- "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+ "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
"deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
"dev": true,
"optional": true,
@@ -3554,6 +3711,7 @@
},
"node_modules/he": {
"version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true,
"bin": {
@@ -3562,7 +3720,7 @@
},
"node_modules/history": {
"version": "3.3.0",
- "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
+ "integrity": "sha512-ABLnJwKEZGXGqWsXaKYD8NNle49ZbKs1WEBlxrFsQ8dIudZpO5NJaH8WJOqh5lXVhAq7bHksfirrobBmrT7qBw==",
"dev": true,
"dependencies": {
"invariant": "^2.2.1",
@@ -3573,7 +3731,7 @@
},
"node_modules/hoek": {
"version": "2.16.3",
- "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+ "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -3591,7 +3749,7 @@
},
"node_modules/home-or-tmp": {
"version": "2.0.0",
- "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+ "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
"dependencies": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.1"
@@ -3618,23 +3776,23 @@
}
},
"node_modules/http-errors": {
- "version": "1.8.1",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "version": "2.0.0",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
"dev": true,
"dependencies": {
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"inherits": "2.0.4",
"setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
+ "statuses": "2.0.1",
"toidentifier": "1.0.1"
},
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/http-parser-js": {
- "version": "0.5.5",
- "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
+ "version": "0.5.8",
+ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
"dev": true
},
"node_modules/http-proxy": {
@@ -3652,7 +3810,7 @@
},
"node_modules/http-proxy-middleware": {
"version": "0.17.4",
- "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+ "integrity": "sha512-JtH3UZju4oXDdca28/kknbm/CFmt35vy0YV0PNOMWWWpn3rT9WV95IXN451xwBGSjy9L0Cah1O9TCMytboLdfw==",
"dev": true,
"dependencies": {
"http-proxy": "^1.16.2",
@@ -3663,7 +3821,7 @@
},
"node_modules/http-proxy-middleware/node_modules/is-extglob": {
"version": "2.1.1",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3671,7 +3829,7 @@
},
"node_modules/http-proxy-middleware/node_modules/is-glob": {
"version": "3.1.0",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"dev": true,
"dependencies": {
"is-extglob": "^2.1.0"
@@ -3682,7 +3840,7 @@
},
"node_modules/http-signature": {
"version": "1.2.0",
- "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0",
@@ -3696,7 +3854,7 @@
},
"node_modules/https-browserify": {
"version": "0.0.1",
- "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+ "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ==",
"dev": true
},
"node_modules/iconv-lite": {
@@ -3730,10 +3888,11 @@
},
"node_modules/iferr": {
"version": "0.1.5",
- "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+ "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="
},
"node_modules/image-size": {
"version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
"integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==",
"dev": true,
"bin": {
@@ -3745,12 +3904,13 @@
},
"node_modules/immediate": {
"version": "3.0.6",
- "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
"dev": true
},
"node_modules/imports-loader": {
"version": "0.6.5",
- "integrity": "sha1-rnRlMDHVnjezwvslRKxhrq41MKY=",
+ "integrity": "sha512-fYIzBL9JOzJszvfeSGSKVjAtkWEtPUwP+OWiUxIWApcxsYh3iqZWZAp8xjTuhsvqglhqaetxeLLTaYyxIv1d4Q==",
"dev": true,
"dependencies": {
"loader-utils": "0.2.x",
@@ -3759,7 +3919,7 @@
},
"node_modules/imports-loader/node_modules/source-map": {
"version": "0.1.43",
- "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+ "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -3770,24 +3930,24 @@
},
"node_modules/imurmurhash": {
"version": "0.1.4",
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
"engines": {
"node": ">=0.8.19"
}
},
"node_modules/indexes-of": {
"version": "1.0.1",
- "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+ "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
"dev": true
},
"node_modules/indexof": {
"version": "0.0.1",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+ "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
"dev": true
},
"node_modules/inflight": {
"version": "1.0.6",
- "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -3799,7 +3959,7 @@
},
"node_modules/interpret": {
"version": "0.6.6",
- "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
+ "integrity": "sha512-Vg6X07U0AOZb4HF6CWHa+jnJU8j71buKQ9Pc0C75qBXgvCYbxWBkGo4jnTS3O0MIc9FZtt0mB7h+uclojqdw1Q==",
"dev": true
},
"node_modules/invariant": {
@@ -3819,7 +3979,7 @@
},
"node_modules/is-absolute-url": {
"version": "2.1.0",
- "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+ "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3846,11 +4006,11 @@
},
"node_modules/is-arrayish": {
"version": "0.2.1",
- "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
},
"node_modules/is-binary-path": {
"version": "1.0.1",
- "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+ "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
"dev": true,
"dependencies": {
"binary-extensions": "^1.0.0"
@@ -3864,8 +4024,8 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"node_modules/is-core-module": {
- "version": "2.8.1",
- "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+ "version": "2.13.0",
+ "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
"dependencies": {
"has": "^1.0.3"
},
@@ -3915,14 +4075,14 @@
},
"node_modules/is-dotfile": {
"version": "1.0.3",
- "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+ "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-equal-shallow": {
"version": "0.1.3",
- "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+ "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
"dependencies": {
"is-primitive": "^2.0.0"
},
@@ -3932,14 +4092,14 @@
},
"node_modules/is-extendable": {
"version": "0.1.1",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-extglob": {
"version": "1.0.0",
- "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
"engines": {
"node": ">=0.10.0"
}
@@ -3956,7 +4116,7 @@
},
"node_modules/is-glob": {
"version": "2.0.1",
- "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
"dependencies": {
"is-extglob": "^1.0.0"
},
@@ -3966,7 +4126,7 @@
},
"node_modules/is-number": {
"version": "2.1.0",
- "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+ "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -3976,7 +4136,7 @@
},
"node_modules/is-plain-obj": {
"version": "1.1.0",
- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3995,7 +4155,7 @@
},
"node_modules/is-plain-object/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -4003,33 +4163,33 @@
},
"node_modules/is-posix-bracket": {
"version": "0.1.1",
- "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+ "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-primitive": {
"version": "2.0.0",
- "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+ "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-stream": {
"version": "1.1.0",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-typedarray": {
"version": "1.0.0",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
"dev": true
},
"node_modules/is-utf8": {
"version": "0.2.1",
- "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+ "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
},
"node_modules/is-windows": {
"version": "1.0.2",
@@ -4041,16 +4201,16 @@
},
"node_modules/isarray": {
"version": "1.0.0",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
},
"node_modules/isexe": {
"version": "2.0.0",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true
},
"node_modules/isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
"dependencies": {
"isarray": "1.0.0"
},
@@ -4060,24 +4220,24 @@
},
"node_modules/isomorphic-fetch": {
"version": "2.2.1",
- "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+ "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
"dependencies": {
"node-fetch": "^1.0.1",
"whatwg-fetch": ">=0.10.0"
}
},
"node_modules/isomorphic-fetch/node_modules/whatwg-fetch": {
- "version": "3.6.2",
- "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+ "version": "3.6.19",
+ "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw=="
},
"node_modules/isstream": {
"version": "0.1.2",
- "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
"dev": true
},
"node_modules/istanbul": {
"version": "0.3.22",
- "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=",
+ "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
"deprecated": "This module is no longer maintained, try this instead:\n npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
"dev": true,
"dependencies": {
@@ -4119,12 +4279,12 @@
},
"node_modules/istanbul/node_modules/resolve": {
"version": "1.1.7",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
"dev": true
},
"node_modules/istanbul/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"dependencies": {
"has-flag": "^1.0.0"
@@ -4135,7 +4295,7 @@
},
"node_modules/jasmine-only": {
"version": "0.1.2",
- "integrity": "sha1-kb27r5B8wCjRmVao46c8kUR4O+c=",
+ "integrity": "sha512-J2qd9QiHrqi3Tg81LFMCzsMIFb+M7Lz+BtjDSbFyGqjuoKabPKLnP2GBqdZ6xrTf5etVlBIbEPNCEiwM7ToZ+w==",
"dev": true,
"dependencies": {
"coffee-script": "~ 1.6.3"
@@ -4143,7 +4303,7 @@
},
"node_modules/jasmine-only/node_modules/coffee-script": {
"version": "1.6.3",
- "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4=",
+ "integrity": "sha512-lpusDYw9xym9ZOqFIeQuzzvTvunm2nlRL++BYhUcLn+77vuidExZG+qDPSKUfDXvuaHeFK6QavntXF+HiOq+/Q==",
"deprecated": "CoffeeScript on NPM has moved to \"coffeescript\" (no hyphen)",
"dev": true,
"bin": {
@@ -4156,17 +4316,17 @@
},
"node_modules/jasmine-pit": {
"version": "2.0.2",
- "integrity": "sha1-dVccsb+swK51DWlIrUWNkbqA5ZY=",
+ "integrity": "sha512-RuiO/mG7+srYueK8/xKRMmSvWAZcgL+ouUgPGtNu9l0NNlCcuDUNUtOpmhHVODY3xLol4IwYOc+RImXfSfFpNA==",
"dev": true
},
"node_modules/javascript-natural-sort": {
"version": "0.7.1",
- "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
+ "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
"dev": true
},
"node_modules/jest-cli": {
"version": "0.5.10",
- "integrity": "sha1-s+S4E+C//8OPC34V6qi8j4RcaIc=",
+ "integrity": "sha512-ygEbnmAd5inHWyYEeRI1BMWu+yeybk+pTRWHXJQ8mXR/cOHiQHgVj3ksxenKyQZ4kF4vmWyJoeJrsh5EzrUstQ==",
"dev": true,
"dependencies": {
"coffee-script": "^1.10.0",
@@ -4198,12 +4358,12 @@
},
"node_modules/js-base64": {
"version": "2.1.9",
- "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+ "integrity": "sha512-f+5mYh8iF7FlF7zgmj/yqvvYQUHI0kAxGiLjIfNxZzqJ7RQNc4sjgp8crVJw0Kzv2O6aFGZWgMTnO71I9utHSg==",
"dev": true
},
"node_modules/js-tokens": {
"version": "3.0.2",
- "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+ "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg=="
},
"node_modules/js-yaml": {
"version": "3.14.1",
@@ -4231,12 +4391,12 @@
},
"node_modules/jsbn": {
"version": "0.1.1",
- "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
"dev": true
},
"node_modules/jsdom": {
"version": "6.5.1",
- "integrity": "sha1-tgZNanZRCBr0HVdu3Fa8UeABIsA=",
+ "integrity": "sha512-KeCN3yqR+MmjAZDnVZgIaL2tP9BxSFlsYZw9Z+zy64+jJzHc1m8ruccb83Qe8AG0xKUjpo2kxEGFCMtiF4MmAg==",
"dev": true,
"dependencies": {
"acorn": "^2.4.0",
@@ -4259,7 +4419,7 @@
},
"node_modules/jsesc": {
"version": "1.3.0",
- "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+ "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
"bin": {
"jsesc": "bin/jsesc"
}
@@ -4279,44 +4439,42 @@
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
},
"node_modules/json-stable-stringify": {
- "version": "1.0.1",
- "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+ "version": "1.0.2",
+ "integrity": "sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==",
"dev": true,
"dependencies": {
- "jsonify": "~0.0.0"
+ "jsonify": "^0.0.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/json-stringify-safe": {
"version": "5.0.1",
- "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
- "dev": true
- },
- "node_modules/json3": {
- "version": "3.3.3",
- "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
"dev": true
},
"node_modules/json5": {
"version": "0.5.1",
- "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+ "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
"bin": {
"json5": "lib/cli.js"
}
},
"node_modules/jsonfile": {
"version": "2.4.0",
- "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+ "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
"dev": true,
"optionalDependencies": {
"graceful-fs": "^4.1.6"
}
},
"node_modules/jsonify": {
- "version": "0.0.0",
- "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+ "version": "0.0.1",
+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
"dev": true,
- "engines": {
- "node": "*"
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/jsprim": {
@@ -4334,19 +4492,21 @@
}
},
"node_modules/jszip": {
- "version": "3.7.1",
- "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
"dev": true,
"dependencies": {
"lie": "~3.3.0",
"pako": "~1.0.2",
"readable-stream": "~2.3.6",
- "set-immediate-shim": "~1.0.1"
+ "setimmediate": "^1.0.5"
}
},
"node_modules/jszip/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -4358,8 +4518,15 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/jszip/node_modules/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
+ },
"node_modules/jszip/node_modules/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,
"dependencies": {
@@ -4373,7 +4540,7 @@
},
"node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -4383,7 +4550,7 @@
},
"node_modules/lazy-cache": {
"version": "1.0.4",
- "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+ "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -4412,7 +4579,7 @@
},
"node_modules/less-loader": {
"version": "2.2.3",
- "integrity": "sha1-ttj4E5yEk98J2ZKpOgBzSwj4RSg=",
+ "integrity": "sha512-U7lgRusyqTj1TUB6OBlmow6GigLk0n5ADuTSGblCp0nkXOk+lFq/lHTDXCHkm3WydZha2FVNZivEjCEZNFJCiw==",
"dev": true,
"dependencies": {
"loader-utils": "^0.2.5"
@@ -4423,7 +4590,7 @@
},
"node_modules/less/node_modules/ajv": {
"version": "4.11.8",
- "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+ "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4433,7 +4600,7 @@
},
"node_modules/less/node_modules/assert-plus": {
"version": "0.2.0",
- "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+ "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
"dev": true,
"optional": true,
"engines": {
@@ -4442,7 +4609,7 @@
},
"node_modules/less/node_modules/aws-sign2": {
"version": "0.6.0",
- "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+ "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
"dev": true,
"optional": true,
"engines": {
@@ -4451,7 +4618,7 @@
},
"node_modules/less/node_modules/form-data": {
"version": "2.1.4",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4465,7 +4632,7 @@
},
"node_modules/less/node_modules/har-schema": {
"version": "1.0.5",
- "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+ "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
"dev": true,
"optional": true,
"engines": {
@@ -4474,7 +4641,7 @@
},
"node_modules/less/node_modules/har-validator": {
"version": "4.2.1",
- "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+ "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
"deprecated": "this library is no longer supported",
"dev": true,
"optional": true,
@@ -4488,7 +4655,7 @@
},
"node_modules/less/node_modules/http-signature": {
"version": "1.1.1",
- "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+ "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4503,7 +4670,7 @@
},
"node_modules/less/node_modules/image-size": {
"version": "0.5.5",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+ "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
"dev": true,
"optional": true,
"bin": {
@@ -4515,7 +4682,7 @@
},
"node_modules/less/node_modules/oauth-sign": {
"version": "0.8.2",
- "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+ "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
"dev": true,
"optional": true,
"engines": {
@@ -4524,13 +4691,13 @@
},
"node_modules/less/node_modules/performance-now": {
"version": "0.2.0",
- "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+ "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
"dev": true,
"optional": true
},
"node_modules/less/node_modules/punycode": {
"version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true,
"optional": true
},
@@ -4545,7 +4712,7 @@
},
"node_modules/less/node_modules/request": {
"version": "2.81.0",
- "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+ "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
"dev": true,
"optional": true,
@@ -4591,7 +4758,7 @@
},
"node_modules/levn": {
"version": "0.2.5",
- "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
+ "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
"dev": true,
"dependencies": {
"prelude-ls": "~1.1.0",
@@ -4603,6 +4770,7 @@
},
"node_modules/lie": {
"version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
"integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
"dev": true,
"dependencies": {
@@ -4611,7 +4779,7 @@
},
"node_modules/load-json-file": {
"version": "1.1.0",
- "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
"dependencies": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
@@ -4625,7 +4793,7 @@
},
"node_modules/loader-utils": {
"version": "0.2.17",
- "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+ "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
"dev": true,
"dependencies": {
"big.js": "^3.1.3",
@@ -4636,7 +4804,7 @@
},
"node_modules/locate-path": {
"version": "2.0.0",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
"dependencies": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
@@ -4647,7 +4815,7 @@
},
"node_modules/locate-path/node_modules/path-exists": {
"version": "3.0.0",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
"engines": {
"node": ">=4"
}
@@ -4663,46 +4831,46 @@
},
"node_modules/lodash._basecopy": {
"version": "3.0.1",
- "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+ "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
"dev": true
},
"node_modules/lodash._basetostring": {
"version": "3.0.1",
- "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+ "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
"dev": true
},
"node_modules/lodash._basevalues": {
"version": "3.0.0",
- "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+ "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
"dev": true
},
"node_modules/lodash._getnative": {
"version": "3.9.1",
- "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+ "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
"dev": true
},
"node_modules/lodash._isiterateecall": {
"version": "3.0.9",
- "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+ "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
"dev": true
},
"node_modules/lodash._reinterpolate": {
"version": "3.0.0",
- "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+ "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
"dev": true
},
"node_modules/lodash._root": {
"version": "3.0.1",
- "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+ "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
"dev": true
},
"node_modules/lodash.assign": {
"version": "4.2.0",
- "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+ "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw=="
},
"node_modules/lodash.escape": {
"version": "3.2.0",
- "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+ "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
"dev": true,
"dependencies": {
"lodash._root": "^3.0.0"
@@ -4710,17 +4878,17 @@
},
"node_modules/lodash.isarguments": {
"version": "3.1.0",
- "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+ "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
"dev": true
},
"node_modules/lodash.isarray": {
"version": "3.0.4",
- "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+ "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
"dev": true
},
"node_modules/lodash.keys": {
"version": "3.1.2",
- "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+ "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
"dev": true,
"dependencies": {
"lodash._getnative": "^3.0.0",
@@ -4730,12 +4898,12 @@
},
"node_modules/lodash.restparam": {
"version": "3.6.1",
- "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+ "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
"dev": true
},
"node_modules/lodash.template": {
"version": "3.6.2",
- "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+ "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
"dev": true,
"dependencies": {
"lodash._basecopy": "^3.0.0",
@@ -4751,7 +4919,7 @@
},
"node_modules/lodash.templatesettings": {
"version": "3.1.1",
- "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+ "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
"dev": true,
"dependencies": {
"lodash._reinterpolate": "^3.0.0",
@@ -4759,8 +4927,8 @@
}
},
"node_modules/loglevel": {
- "version": "1.8.0",
- "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+ "version": "1.8.1",
+ "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
"engines": {
"node": ">= 0.6.0"
},
@@ -4771,7 +4939,7 @@
},
"node_modules/longest": {
"version": "1.0.1",
- "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+ "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -4807,7 +4975,7 @@
},
"node_modules/make-dir/node_modules/pify": {
"version": "3.0.0",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
"engines": {
"node": ">=4"
}
@@ -4822,7 +4990,7 @@
},
"node_modules/map-cache": {
"version": "0.2.2",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+ "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -4830,7 +4998,7 @@
},
"node_modules/map-visit": {
"version": "1.0.0",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
"dev": true,
"dependencies": {
"object-visit": "^1.0.0"
@@ -4840,8 +5008,8 @@
}
},
"node_modules/math-expression-evaluator": {
- "version": "1.3.14",
- "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
+ "version": "1.4.0",
+ "integrity": "sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw==",
"dev": true
},
"node_modules/math-random": {
@@ -4850,7 +5018,7 @@
},
"node_modules/media-typer": {
"version": "0.3.0",
- "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -4858,7 +5026,7 @@
},
"node_modules/memory-fs": {
"version": "0.3.0",
- "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
+ "integrity": "sha512-QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ==",
"dev": true,
"dependencies": {
"errno": "^0.1.3",
@@ -4866,8 +5034,8 @@
}
},
"node_modules/memory-fs/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -4879,6 +5047,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/memory-fs/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/memory-fs/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -4894,12 +5067,12 @@
},
"node_modules/merge-descriptors": {
"version": "1.0.1",
- "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+ "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
"dev": true
},
"node_modules/methods": {
"version": "1.1.2",
- "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -4907,7 +5080,7 @@
},
"node_modules/micromatch": {
"version": "2.3.11",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+ "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
"dependencies": {
"arr-diff": "^2.0.0",
"array-unique": "^0.2.1",
@@ -4939,19 +5112,19 @@
}
},
"node_modules/mime-db": {
- "version": "1.51.0",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "version": "1.52.0",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"dev": true,
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mime-types": {
- "version": "2.1.34",
- "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+ "version": "2.1.35",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"dev": true,
"dependencies": {
- "mime-db": "1.51.0"
+ "mime-db": "1.52.0"
},
"engines": {
"node": ">= 0.6"
@@ -4968,8 +5141,11 @@
}
},
"node_modules/minimist": {
- "version": "1.2.5",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ "version": "1.2.8",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/mississippi": {
"version": "2.0.0",
@@ -5014,18 +5190,18 @@
}
},
"node_modules/mkdirp": {
- "version": "0.5.5",
- "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "version": "0.5.6",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
"dependencies": {
- "minimist": "^1.2.5"
+ "minimist": "^1.2.6"
},
"bin": {
"mkdirp": "bin/cmd.js"
}
},
"node_modules/moment": {
- "version": "2.29.1",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "version": "2.29.4",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"dev": true,
"engines": {
"node": "*"
@@ -5033,7 +5209,7 @@
},
"node_modules/move-concurrently": {
"version": "1.0.1",
- "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+ "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
"dependencies": {
"aproba": "^1.1.1",
"copy-concurrently": "^1.0.0",
@@ -5045,7 +5221,7 @@
},
"node_modules/ms": {
"version": "2.0.0",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/nanomatch": {
"version": "1.2.13",
@@ -5070,7 +5246,7 @@
},
"node_modules/nanomatch/node_modules/arr-diff": {
"version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5078,7 +5254,7 @@
},
"node_modules/nanomatch/node_modules/array-unique": {
"version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5094,7 +5270,7 @@
},
"node_modules/ncp": {
"version": "1.0.1",
- "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
+ "integrity": "sha512-akBX7I5X9KQDDWmYYgQlLbVbjkveTje2mioZjhLLrVt09akSZcoqXWE5LEn1E2fu8T7th1PZYGfewQsTkTLTmQ==",
"dev": true,
"bin": {
"ncp": "bin/ncp"
@@ -5115,7 +5291,7 @@
},
"node_modules/node-balanced": {
"version": "0.0.14",
- "integrity": "sha1-ozxyeFfTBE8eiL5y3X2anQtPwh8=",
+ "integrity": "sha512-X0dI9P/OTETpHEqMpv4BRvlj6U0iLV+2YcKf8XayxGdEA86YpaCg8CnxgsD77YldxgY21tjOxRdCsSGLRfS2Ug==",
"dev": true
},
"node_modules/node-fetch": {
@@ -5128,7 +5304,7 @@
},
"node_modules/node-haste": {
"version": "1.2.8",
- "integrity": "sha1-0vEOk9dWfCaJrIP8BNtNdsqnDzw=",
+ "integrity": "sha512-8eEwaAWGtLajkqYhJ7M+gqPpHqn+ax1rj8FWi5WJaJ4bIUzKx5uiqguTYLcH9W5MG8S+hLXMHrPgBZNaPzlgtQ==",
"dev": true,
"dependencies": {
"esprima-fb": "4001.1001.0-dev-harmony-fb"
@@ -5136,12 +5312,12 @@
},
"node_modules/node-int64": {
"version": "0.4.0",
- "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
"dev": true
},
"node_modules/node-libs-browser": {
"version": "0.7.0",
- "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
+ "integrity": "sha512-V0EeBff5/nauAta4yGYMdn/CYXpn2KYcE8r6rwU9qJDXG6wMrBhtWVfoKWphSvsnX+mZk6DzaGSO+Yz/MGBAGQ==",
"dev": true,
"dependencies": {
"assert": "^1.1.1",
@@ -5171,12 +5347,12 @@
},
"node_modules/node-libs-browser/node_modules/punycode": {
"version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true
},
"node_modules/node-libs-browser/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -5196,19 +5372,24 @@
"safe-buffer": "~5.1.0"
}
},
+ "node_modules/node-libs-browser/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/node-libs-browser/node_modules/string_decoder": {
"version": "0.10.31",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
"dev": true
},
"node_modules/node-worker-pool": {
"version": "3.0.2",
- "integrity": "sha1-IQZTLJGhgnnj2aQRe1oqbaGgjpw=",
+ "integrity": "sha512-xyvOK6UXpZrUUzXV1GWmS52l9gQTc/GQKnPnSd7RJMigmrf+o0iCO80jFgqojGlEC+4/zfxi8uGtXUEE2pB72g==",
"dev": true
},
"node_modules/nopt": {
"version": "3.0.6",
- "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+ "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
"dev": true,
"dependencies": {
"abbrev": "1"
@@ -5229,7 +5410,7 @@
},
"node_modules/normalize-path": {
"version": "2.1.1",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
@@ -5239,12 +5420,12 @@
},
"node_modules/normalize-selector": {
"version": "0.2.0",
- "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+ "integrity": "sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==",
"dev": true
},
"node_modules/normalize-url": {
"version": "1.9.1",
- "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+ "integrity": "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==",
"dev": true,
"dependencies": {
"object-assign": "^4.0.1",
@@ -5258,7 +5439,7 @@
},
"node_modules/num2fraction": {
"version": "1.2.2",
- "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+ "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
"dev": true
},
"node_modules/numbro": {
@@ -5270,7 +5451,7 @@
},
"node_modules/numeral": {
"version": "2.0.6",
- "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=",
+ "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==",
"dev": true,
"engines": {
"node": "*"
@@ -5291,14 +5472,14 @@
},
"node_modules/object-assign": {
"version": "4.1.1",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/object-copy": {
"version": "0.1.0",
- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+ "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
"dev": true,
"dependencies": {
"copy-descriptor": "^0.1.0",
@@ -5311,7 +5492,7 @@
},
"node_modules/object-copy/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dev": true,
"dependencies": {
"is-descriptor": "^0.1.0"
@@ -5322,7 +5503,7 @@
},
"node_modules/object-copy/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -5333,7 +5514,7 @@
},
"node_modules/object-copy/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -5363,9 +5544,25 @@
"node": ">=0.10.0"
}
},
+ "node_modules/object-inspect": {
+ "version": "1.12.3",
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object-keys": {
+ "version": "1.1.1",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/object-visit": {
"version": "1.0.1",
- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+ "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
"dev": true,
"dependencies": {
"isobject": "^3.0.0"
@@ -5376,15 +5573,32 @@
},
"node_modules/object-visit/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/object.assign": {
+ "version": "4.1.4",
+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/object.omit": {
"version": "2.0.1",
- "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+ "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
"dependencies": {
"for-own": "^0.1.4",
"is-extendable": "^0.1.1"
@@ -5395,7 +5609,7 @@
},
"node_modules/object.pick": {
"version": "1.3.0",
- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+ "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
"dev": true,
"dependencies": {
"isobject": "^3.0.1"
@@ -5406,15 +5620,15 @@
},
"node_modules/object.pick/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/on-finished": {
- "version": "2.3.0",
- "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+ "version": "2.4.1",
+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
"dev": true,
"dependencies": {
"ee-first": "1.1.1"
@@ -5433,14 +5647,14 @@
},
"node_modules/once": {
"version": "1.4.0",
- "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
"dependencies": {
"wrappy": "1"
}
},
"node_modules/open": {
"version": "0.0.5",
- "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
+ "integrity": "sha512-+X/dJYLapVO1VbC620DhtNZK9U4/kQVaTQp/Gh7cb6UTLYfGZzzU2ZXkWrOA/wBrf4UqAFwtLqXYTxe4tSnWQQ==",
"dev": true,
"engines": {
"node": ">= 0.6.0"
@@ -5448,7 +5662,7 @@
},
"node_modules/optimist": {
"version": "0.6.1",
- "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+ "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
"dev": true,
"dependencies": {
"minimist": "~0.0.1",
@@ -5457,12 +5671,12 @@
},
"node_modules/optimist/node_modules/minimist": {
"version": "0.0.10",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+ "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
"dev": true
},
"node_modules/optimist/node_modules/wordwrap": {
"version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+ "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
"dev": true,
"engines": {
"node": ">=0.4.0"
@@ -5470,7 +5684,7 @@
},
"node_modules/optionator": {
"version": "0.5.0",
- "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=",
+ "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
"dev": true,
"dependencies": {
"deep-is": "~0.1.2",
@@ -5486,35 +5700,27 @@
},
"node_modules/optionator/node_modules/wordwrap": {
"version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+ "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
"dev": true,
"engines": {
"node": ">=0.4.0"
}
},
- "node_modules/original": {
- "version": "1.0.2",
- "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
- "dev": true,
- "dependencies": {
- "url-parse": "^1.4.3"
- }
- },
"node_modules/os-browserify": {
"version": "0.2.1",
- "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+ "integrity": "sha512-vHbnbzdqWJWvGOm7aOMDXHVUykPG0GdhfLkn5ZDmvbRI+wPj/XoB0/CRAkP9v28eZ7REIPPHJa+8ZEYixsWKmQ==",
"dev": true
},
"node_modules/os-homedir": {
"version": "1.0.2",
- "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/os-tmpdir": {
"version": "1.0.2",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
"engines": {
"node": ">=0.10.0"
}
@@ -5531,7 +5737,7 @@
},
"node_modules/p-locate": {
"version": "2.0.0",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
"dependencies": {
"p-limit": "^1.1.0"
},
@@ -5541,13 +5747,14 @@
},
"node_modules/p-try": {
"version": "1.0.0",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
"engines": {
"node": ">=4"
}
},
"node_modules/pako": {
"version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
"dev": true
},
@@ -5561,8 +5768,8 @@
}
},
"node_modules/parallel-transform/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -5573,6 +5780,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/parallel-transform/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/parallel-transform/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -5582,7 +5793,7 @@
},
"node_modules/parse-glob": {
"version": "3.0.4",
- "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+ "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
"dependencies": {
"glob-base": "^0.3.0",
"is-dotfile": "^1.0.0",
@@ -5595,7 +5806,7 @@
},
"node_modules/parse-json": {
"version": "2.2.0",
- "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
"dependencies": {
"error-ex": "^1.2.0"
},
@@ -5605,7 +5816,7 @@
},
"node_modules/parse5": {
"version": "1.5.1",
- "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+ "integrity": "sha512-w2jx/0tJzvgKwZa58sj2vAYq/S/K1QJfIB3cWYea/Iu1scFPDQQ3IQiVZTHWtRBwAjv2Yd7S/xeZf3XqLDb3bA==",
"dev": true
},
"node_modules/parseurl": {
@@ -5618,7 +5829,7 @@
},
"node_modules/pascalcase": {
"version": "0.1.1",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+ "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5626,12 +5837,12 @@
},
"node_modules/path-browserify": {
"version": "0.0.0",
- "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+ "integrity": "sha512-WA3pxi1olUQcsl82W576vkqhUSGp0uBtr/381pxx5WXLp3NC+AB99hUG3aGW7H0Kg9PFr1D8wv1iJeICe+9Mhw==",
"dev": true
},
"node_modules/path-exists": {
"version": "2.1.0",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
"dependencies": {
"pinkie-promise": "^2.0.0"
},
@@ -5641,7 +5852,7 @@
},
"node_modules/path-is-absolute": {
"version": "1.0.1",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
"engines": {
"node": ">=0.10.0"
}
@@ -5652,12 +5863,12 @@
},
"node_modules/path-to-regexp": {
"version": "0.1.7",
- "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
"dev": true
},
"node_modules/path-type": {
"version": "1.1.0",
- "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+ "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
"dependencies": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
@@ -5669,31 +5880,31 @@
},
"node_modules/pbkdf2-compat": {
"version": "2.0.1",
- "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
+ "integrity": "sha512-JYubxYhymODUUWVq9/Tmo9VQFZ8LyrD/pbXVpwmt1Npr2z29KZwp7+IBT3/PRjr1xpecX4W1EcbjFjp8nE3stQ==",
"dev": true
},
"node_modules/performance-now": {
"version": "2.1.0",
- "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
"dev": true
},
"node_modules/pify": {
"version": "2.3.0",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/pinkie": {
"version": "2.0.4",
- "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+ "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/pinkie-promise": {
"version": "2.0.1",
- "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+ "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
"dependencies": {
"pinkie": "^2.0.0"
},
@@ -5703,7 +5914,7 @@
},
"node_modules/pkg-dir": {
"version": "1.0.0",
- "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+ "integrity": "sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg==",
"dev": true,
"dependencies": {
"find-up": "^1.0.0"
@@ -5718,7 +5929,7 @@
},
"node_modules/posix-character-classes": {
"version": "0.1.1",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5726,7 +5937,7 @@
},
"node_modules/postcss": {
"version": "4.1.16",
- "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=",
+ "integrity": "sha512-aAutxE8MvL1bHylFMYb2c2nniFax8XDztHzZ+x5DVsNJnoW6VHvGSNSqdW3+ip255HCWfPjayVVFzMmyiL7opA==",
"dev": true,
"dependencies": {
"es6-promise": "~2.3.0",
@@ -5736,7 +5947,7 @@
},
"node_modules/postcss-calc": {
"version": "4.1.0",
- "integrity": "sha1-vuf/ySjHmGmZ7vF7LdiXDIk31HI=",
+ "integrity": "sha512-N6ppZeyWp/7NEgZUIPYK2krNFDPSVTv+fTJ0y+YfTsNc4LmRXZMsiHBcSJ3zSgU5Oc7r6eg6RX9bCAFq2LDP0w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11",
@@ -5746,7 +5957,7 @@
},
"node_modules/postcss-colormin": {
"version": "1.2.7",
- "integrity": "sha1-63Pb6DgE6pGYNWsTL2+Z9GAP1lQ=",
+ "integrity": "sha512-RuYPkKOTG1S493X83yeSf8HgcjTrMsy9+pyAXvYfv+Q07jlbX/h8ECwjhjFna6f/OK0YWgpEjxN+gRuE19EHzQ==",
"dev": true,
"dependencies": {
"color": "^0.10.1",
@@ -5757,7 +5968,7 @@
},
"node_modules/postcss-convert-values": {
"version": "1.3.1",
- "integrity": "sha1-I/GHxhP6d7Y3p4BblIteCJlpDkY=",
+ "integrity": "sha512-xZ6gewHaeK+CHOXXss6KnqCppRxJRadHESauJY+pkeMjrpMeJdlnCQmpEULqNNwcLYBj0UcnQ2DI8IoPuUcHNg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16",
@@ -5766,7 +5977,7 @@
},
"node_modules/postcss-discard-comments": {
"version": "1.2.1",
- "integrity": "sha1-hR3Ka5NUwPtjFssaEEj29eOWCtA=",
+ "integrity": "sha512-8EhZvSq4wF30EEoL8RGzFejBOFZ3UA6xCWXHR0v5mfbEw4htS4+qCDI1ejLIVPrFqRj7LbniIFM7BJsKo/Cjkw==",
"dev": true,
"dependencies": {
"node-balanced": "0.0.14",
@@ -5775,7 +5986,7 @@
},
"node_modules/postcss-discard-duplicates": {
"version": "1.2.1",
- "integrity": "sha1-SbsztNNHcQWwDQSDlfc6KQK8miU=",
+ "integrity": "sha512-ua2mOGv5kny6s+jSEjzxQla/BFS8P003lPAV7Z6/9NPHkWyukq76Gv3EUvhLBVnx14ToIpOJwDRrAoKo4TbktA==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5783,7 +5994,7 @@
},
"node_modules/postcss-discard-empty": {
"version": "1.1.2",
- "integrity": "sha1-KsVayPy4HCMEPmMQaTT9Y0cNXA0=",
+ "integrity": "sha512-+pmpPZNua5PksvWVUnQzaTfWxt4JWrzctpkQaynxEA+T20z/2mIr+JGWYHolTwaCkMgDGj0vuLAJxdwTRsclFQ==",
"dev": true,
"dependencies": {
"postcss": "^4.1.13"
@@ -5791,7 +6002,7 @@
},
"node_modules/postcss-discard-unused": {
"version": "1.0.3",
- "integrity": "sha1-Xsy5v6xGXqa+VjQpepx3gczQmIY=",
+ "integrity": "sha512-KjNXbZw66Yez992IUCG5z+6gjA1WgX3K2RtieFlB5k9U0Jp4M/NB7TL4tTj4I6Ug5LUzmVFB+nAtf0+9nYgjiA==",
"dev": true,
"dependencies": {
"flatten": "0.0.1",
@@ -5801,7 +6012,7 @@
},
"node_modules/postcss-filter-plugins": {
"version": "1.0.1",
- "integrity": "sha1-J/gnnV76t6o8FwmIE5hrS50dUOI=",
+ "integrity": "sha512-frP9Wq2HZhC6EYLl0e7AJb4GfscxJknnHb9AvTiypicPFinC/tTwKtr7Fy2Oij0BBhMcJL4WnVFSMs16/ZD2xA==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11",
@@ -5810,7 +6021,7 @@
},
"node_modules/postcss-font-family": {
"version": "1.2.1",
- "integrity": "sha1-dQJSSzmDox5q9k5LqhA07W7YQYw=",
+ "integrity": "sha512-c32Jf4YlO3p/y2KmTp328lDoNJJ+U/lJQomRhSwhTeZGTjDSPLLtfeq9WwHClZur/TRAMZeCQ1UByhKy0zmwGA==",
"dev": true,
"dependencies": {
"object-assign": "^3.0.0",
@@ -5820,7 +6031,7 @@
},
"node_modules/postcss-font-family/node_modules/object-assign": {
"version": "3.0.0",
- "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+ "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5828,7 +6039,7 @@
},
"node_modules/postcss-merge-idents": {
"version": "1.0.2",
- "integrity": "sha1-qToNrXj2UugjfZrew0LkHSwd01s=",
+ "integrity": "sha512-e/HiIm+YUrL11hX1H64is+P04PVixSFEe+Gmo8eNzCaCA5+SWNNr9O0ZAkogiUcGhITgbhl/+YGFnMJ7OrYM2g==",
"dev": true,
"dependencies": {
"css-list": "^0.1.0",
@@ -5837,7 +6048,7 @@
},
"node_modules/postcss-merge-longhand": {
"version": "1.0.2",
- "integrity": "sha1-QxcgZfz4We4RztMUH1ZkFMZzBX4=",
+ "integrity": "sha512-Or1dsH5Vk7WgzkiILVKdNKIVQgGGJQkVBEkt0fZiO4pmXKTuZBDFx7cFZ4MuTJhoK63jdlpLqeSL9KUzZ41H/Q==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5845,7 +6056,7 @@
},
"node_modules/postcss-merge-rules": {
"version": "1.3.6",
- "integrity": "sha1-sUrRf31AEqMYut032r1ZuT8TUy8=",
+ "integrity": "sha512-uZhWp298tCYHzQZz0qvgKbYY9jzp3doT3fDudvyQ1WnnLHgpaqWaRaixVmq82lT8IuR7Ike/yHUb+zrgE7Yhuw==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5853,12 +6064,12 @@
},
"node_modules/postcss-message-helpers": {
"version": "2.0.0",
- "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+ "integrity": "sha512-tPLZzVAiIJp46TBbpXtrUAKqedXSyW5xDEo1sikrfEfnTs+49SBZR/xDdqCiJvSSbtr615xDsaMF3RrxS2jZlA==",
"dev": true
},
"node_modules/postcss-minify-font-weight": {
"version": "1.0.1",
- "integrity": "sha1-aI5CzfI27Osb1WOojPHSTQOgWIg=",
+ "integrity": "sha512-l2w8G/G2jjePa+SzeAAzMGSvsFgsfUIDuizG2VOqXsUy//tx1tL7daMptqzc+xo1Ji6ILs8xSMW4KF8uzBtXmg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11"
@@ -5866,7 +6077,7 @@
},
"node_modules/postcss-minify-selectors": {
"version": "1.5.0",
- "integrity": "sha1-5ZxWxtSVXaFXz30iv4Bptur1Jic=",
+ "integrity": "sha512-SqeHUr0Y+QMbfvpCcWu4lg8NiOlAIXoleDlrapgfwBBypFfxrKdUwimEc0e+ROQR0s+YZGYIz5RzxxeEBcnGDQ==",
"dev": true,
"dependencies": {
"javascript-natural-sort": "^0.7.1",
@@ -5878,7 +6089,7 @@
},
"node_modules/postcss-modules-extract-imports": {
"version": "0.0.5",
- "integrity": "sha1-zMy0Cz3SmFmZOEodumDGLJYKbaA=",
+ "integrity": "sha512-5aDf1iigEVDSOZVk6yqrfNl2R2oFlgvxs3vuClg7feV3r+ETcwuWEiJdzxMPdzfYq7psJ1QFUYcWOC8Q3+Rh1w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11"
@@ -5886,7 +6097,7 @@
},
"node_modules/postcss-modules-local-by-default": {
"version": "0.0.11",
- "integrity": "sha1-qACvQyHDpOCFLRrlKeb8mRrTlec=",
+ "integrity": "sha512-e0m48wTMnsdZ62Ps23uvMsOvht6XL46UNM23jaAAxRgAdELEMARi3p1ogFll59u9K6i7cIFxunWYpxlTqvWLqw==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.1",
@@ -5895,7 +6106,7 @@
},
"node_modules/postcss-modules-scope": {
"version": "0.0.8",
- "integrity": "sha1-gck1+/KJJyOIyLoulqEcohugmgQ=",
+ "integrity": "sha512-iYDhIsMEGsnNpw+sAy7pNtaQA/FGZqUQX29A72yDU5ejLzWJNZOHyMshLsWquGsknTrmL4nSk7CFkq5N6vS02w==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.0",
@@ -5904,7 +6115,7 @@
},
"node_modules/postcss-normalize-url": {
"version": "2.1.3",
- "integrity": "sha1-8StfShFDyV6gJfx/jgBQkFmPNgI=",
+ "integrity": "sha512-OSm6GAr4sl4BGzl6fcEW1Pr5mFjCRJpnPssQY0EvXeQbaC3omfbB1vEh+xc8Pyih9ewoYlLy2Bkfh492xscAXQ==",
"dev": true,
"dependencies": {
"is-absolute-url": "^2.0.0",
@@ -5916,7 +6127,7 @@
},
"node_modules/postcss-ordered-values": {
"version": "1.1.1",
- "integrity": "sha1-nu1PrS55Kr/D0EAs93O6+G/ne4E=",
+ "integrity": "sha512-CKE/Rck09Me8eEpOgn5DwzQOloCCgSqDQ96QDPXJnRZy4LddNM7F4p67wnBeNV5p4JNUW67HMBjtT8jDxsUA5g==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16",
@@ -5925,7 +6136,7 @@
},
"node_modules/postcss-reduce-idents": {
"version": "1.0.3",
- "integrity": "sha1-p58bJIXiPZs8x6gfXsY6XCvewg0=",
+ "integrity": "sha512-0UubRdgHMxkMuKmtkkWqvq1NINZqekbL6qx21FZ3UwCoVEqOSV3YrMXdBP8rGb5tUt74DJ4NLFrYiQcvKJ9sZg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.2",
@@ -5934,7 +6145,7 @@
},
"node_modules/postcss-selector-parser": {
"version": "1.3.3",
- "integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
+ "integrity": "sha512-YVWTPQprpsXhiQyZe3PW1U5stw+/OI7mMG7REN5sx9z6eaIpuzTUm5vy9RI4NTLR7hC9SqNYmxhyxTkorC2KFg==",
"dev": true,
"dependencies": {
"flatten": "^1.0.2",
@@ -5950,7 +6161,7 @@
},
"node_modules/postcss-single-charset": {
"version": "0.3.0",
- "integrity": "sha1-2n/Q3szPYy8bdMei7j41vilFZXM=",
+ "integrity": "sha512-PsdF5mfVqzPzwPBsIwTbcgnWqjHnEHD+tpCL19PvNnQUlqHDb5bxTkC6fH8uqLcEiS/ponEIsjKPp/HR0E32Bg==",
"deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
"dev": true,
"dependencies": {
@@ -5960,7 +6171,7 @@
},
"node_modules/postcss-unique-selectors": {
"version": "1.0.1",
- "integrity": "sha1-SBfnTHtPmZzgTI5mRRoZaRT12zw=",
+ "integrity": "sha512-91GmlJUS9AAwigXh3RCsx4SPMUkPUbjCYfH8kHOSziVKrPLutB0xchqIiLZ90j4B5gEQ+qCZBmcP6XcDojtOtQ==",
"dev": true,
"dependencies": {
"javascript-natural-sort": "^0.7.1",
@@ -5970,12 +6181,12 @@
},
"node_modules/postcss-value-parser": {
"version": "1.4.2",
- "integrity": "sha1-GGVjPhNwH4pyHng02tGFyxRKrQw=",
+ "integrity": "sha512-22vc2Fs4uAZTNRbQ9M7yU877FYXkKIq7aaTgm0gg+Q9Yj+SkcMVYjZ/hJ3adaUBJlZDz2dGLcjHzSt13mAMh+Q==",
"dev": true
},
"node_modules/postcss-zindex": {
"version": "1.1.3",
- "integrity": "sha1-SVZKtJ092hcGf42sHIM11/LQDOE=",
+ "integrity": "sha512-qJTMfyi9QDYI4RboxedqQHB9+JWrk6gNQqvQ2oKkL/NmwDCPRj1soaIW+P3OmA+i7qQebzU0d17MRDpYliFq1w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.2"
@@ -5983,12 +6194,12 @@
},
"node_modules/postcss/node_modules/es6-promise": {
"version": "2.3.0",
- "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw=",
+ "integrity": "sha512-oyOjMhyKMLEjOOtvkwg0G4pAzLQ9WdbbeX7WdqKzvYXu+UFgD0Zo/Brq5Q49zNmnGPPzV5rmYvrr0jz1zWx8Iw==",
"dev": true
},
"node_modules/postcss/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -5999,7 +6210,7 @@
},
"node_modules/prelude-ls": {
"version": "1.1.2",
- "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
"dev": true,
"engines": {
"node": ">= 0.8.0"
@@ -6007,7 +6218,7 @@
},
"node_modules/prepend-http": {
"version": "1.0.4",
- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+ "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -6015,7 +6226,7 @@
},
"node_modules/preserve": {
"version": "0.2.0",
- "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+ "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
"engines": {
"node": ">=0.10.0"
}
@@ -6029,7 +6240,7 @@
},
"node_modules/process": {
"version": "0.11.10",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
"dev": true,
"engines": {
"node": ">= 0.6.0"
@@ -6048,7 +6259,7 @@
},
"node_modules/promise-inflight": {
"version": "1.0.1",
- "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
},
"node_modules/prop-types": {
"version": "15.8.1",
@@ -6091,15 +6302,15 @@
},
"node_modules/prr": {
"version": "1.0.1",
- "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+ "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
},
"node_modules/pseudomap": {
"version": "1.0.2",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+ "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
},
"node_modules/psl": {
- "version": "1.8.0",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+ "version": "1.9.0",
+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
"dev": true
},
"node_modules/pump": {
@@ -6120,8 +6331,8 @@
}
},
"node_modules/punycode": {
- "version": "2.1.1",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "version": "2.3.0",
+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
"engines": {
"node": ">=6"
}
@@ -6136,7 +6347,7 @@
},
"node_modules/query-string": {
"version": "4.3.4",
- "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+ "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
"dev": true,
"dependencies": {
"object-assign": "^4.1.0",
@@ -6146,18 +6357,9 @@
"node": ">=0.10.0"
}
},
- "node_modules/querystring": {
- "version": "0.2.0",
- "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
- "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
- "dev": true,
- "engines": {
- "node": ">=0.4.x"
- }
- },
"node_modules/querystring-es3": {
"version": "0.2.1",
- "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
"dev": true,
"engines": {
"node": ">=0.4.x"
@@ -6203,12 +6405,12 @@
}
},
"node_modules/raw-body": {
- "version": "2.4.3",
- "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+ "version": "2.5.1",
+ "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
},
@@ -6237,7 +6439,7 @@
},
"node_modules/rc-checkbox": {
"version": "1.5.0",
- "integrity": "sha1-RkzptAsa2dEZUkztF0pgp7TrdSk=",
+ "integrity": "sha512-XAEKjZdSz0JPVrZZg1ZpPUEhi2q9M/bxr6RNUgzSJkhvFwD06UBqVQcJzGDr/izlbGGXnt6QA6sJ6uwTarvAYQ==",
"dependencies": {
"classnames": "2.x",
"rc-util": "^4.0.1"
@@ -6256,7 +6458,7 @@
},
"node_modules/react": {
"version": "15.4.2",
- "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=",
+ "integrity": "sha512-qfWUqdaiZjHlmsWI9Cvw9UvugnxluSsEoSOeykOiB37xQokYpxNqdQizNsAqVQvrNz4I8Pf7wCfB5g+ocvJS8Q==",
"dependencies": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -6268,7 +6470,7 @@
},
"node_modules/react-addons-update": {
"version": "15.3.2",
- "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=",
+ "integrity": "sha512-IXmplRjYEq7iE0QnSrI4Dbne/7+CwlyGjp+4g1XbsSjSgnW4djKkfOsD7ZwCjYlXON1KU5rDfgC/Er1e9CgX0g==",
"peerDependencies": {
"react": "^15.3.2"
}
@@ -6298,7 +6500,7 @@
},
"node_modules/react-bootstrap-table": {
"version": "3.5.1",
- "integrity": "sha1-wkKKX+zpgj8La97ffxmGMKxVoWQ=",
+ "integrity": "sha512-BSgTbIFFQdhNJ36aBdTz44LHDPYCFbX74zFNSS0jnUlm588hlAsEuD1aUghiHLzQyMD4J46cxBCQy4b9s+NAMw==",
"dependencies": {
"@allenfang/react-toastr": "2.8.2",
"classnames": "^2.1.2",
@@ -6310,7 +6512,7 @@
},
"node_modules/react-bootstrap-table/node_modules/exenv": {
"version": "1.2.0",
- "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk="
+ "integrity": "sha512-4wr7O1jptvGPYWb1PHyX6QGcJlP3V7CRD4CPjw+k2k/Drbi2DMHic2OqnQ2kHEImmpAtNFJL1PNXbiN9JgXD6w=="
},
"node_modules/react-bootstrap-table/node_modules/react-modal": {
"version": "1.9.7",
@@ -6330,7 +6532,7 @@
},
"node_modules/react-bootstrap-typeahead": {
"version": "1.4.2",
- "integrity": "sha1-GRPjLOpNeb7NA6yrvZM2EWiEgVs=",
+ "integrity": "sha512-cNX0z5Inrlf8MyU9Wtq9mCmnLGr09Vm0H24uj7qPDw7qqIPWk8po3F8cv8CSPEYhul6mDMz1BA3R5Q7DqrYAjg==",
"dependencies": {
"classnames": "^2.2.0",
"create-react-class": "^15.5.2",
@@ -6366,7 +6568,7 @@
},
"node_modules/react-date-picker": {
"version": "3.1.10",
- "integrity": "sha1-X9V5jbxEqVfUciL3PUdWxs7V4Gk=",
+ "integrity": "sha512-zqCDgMfptEy6pmQ8+yZDFjAJtZBXbmz98x7JpSDIbww+CNujGhi9x9lxfF+WIg4/Wee43SnNpSjJctWQSjmQlQ==",
"deprecated": "React-Date-Picker 5.x and older is deprecated. The authors of these versions have disappeared. Please upgrade to version 6.x to get fully maintained package with support for React 16. It requires some changes on your side, but in most cases it shouldn't take you more than a few minutes. See project's page for instructions and support.",
"dev": true,
"dependencies": {
@@ -6380,7 +6582,7 @@
},
"node_modules/react-dom": {
"version": "15.4.2",
- "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=",
+ "integrity": "sha512-k5NZrskw9K6rTlgIH/z4exMQuQQfzF8z2G7Ic+9vODPTycx//qyuOTiAhYhjlOaHFsIH2IXWJ4n4JiwheDBXNA==",
"dependencies": {
"fbjs": "^0.8.1",
"loose-envify": "^1.1.0",
@@ -6392,11 +6594,11 @@
},
"node_modules/react-dom-factories": {
"version": "1.0.2",
- "integrity": "sha1-63cFxNs2+1AbOqOP91lhaqD/luA="
+ "integrity": "sha512-Bmic2N3oKji7vw9qjDr2dmwHvOATbFSnKy7EH0uT/qjvzIUsiXp6Yquk72LJ3WfMtRnq3ujXMMo7GsJeLPfFWw=="
},
"node_modules/react-filtered-multiselect": {
"version": "0.4.2",
- "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=",
+ "integrity": "sha512-hYR3ThQ2hFvOt+TA3iUTh2F80rNUiSbSr54gq3Rlb4/bb99FD+7WtZiYRJvEOlCH4qBPmyglzWilPjF2M0igZg==",
"peerDependencies": {
"react": ">=0.14.0"
}
@@ -6416,7 +6618,7 @@
},
"node_modules/react-hot-api": {
"version": "0.4.7",
- "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=",
+ "integrity": "sha512-jFFfeyjTs/HOhXMgzQi71E2fp9W0IHoFaUrszUECfdmRF2q4JoADmtc1Zo0IgGvc4PUujAJ8q6su5R+0ttkAmg==",
"dev": true,
"peerDependencies": {
"react": ">=0.11.0 || ^0.14.0-rc"
@@ -6424,7 +6626,7 @@
},
"node_modules/react-hot-loader": {
"version": "1.3.1",
- "integrity": "sha1-yVZHrni3Pfzv9uxx/8sEGC/22vk=",
+ "integrity": "sha512-J8jCmvIKI/SNV4M+w0JNBw19/Ve+Hh4sg8WmQ+ldfGW9c0/2PU4d6LrJbyW6en8iJ6ygTxM810DgC2j8V+3T9g==",
"dev": true,
"dependencies": {
"react-hot-api": "^0.4.5",
@@ -6433,7 +6635,7 @@
},
"node_modules/react-hot-loader/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -6444,7 +6646,7 @@
},
"node_modules/react-input-autosize": {
"version": "1.2.0",
- "integrity": "sha1-hyQQcRWfdCEjiXaR2meW7DO1fQU=",
+ "integrity": "sha512-xlmWqzUnBb07xPrsR8iWMOJ2wPqhCEy8jwspum09luCB1nDkDar6ychBZSM6DRZyLF2KFAPmvEVe0/UsbQUmmg==",
"dependencies": {
"create-react-class": "^15.5.2",
"prop-types": "^15.5.8"
@@ -6455,7 +6657,8 @@
},
"node_modules/react-interactive": {
"version": "0.4.1",
- "integrity": "sha1-mRK5lyXPwrx0gPlT565fEnvzcug=",
+ "resolved": "https://registry.npmjs.org/react-interactive/-/react-interactive-0.4.1.tgz",
+ "integrity": "sha512-IzWpnuKRZc7z3ss72+yk29bcZjxjiMz3Un4BnJw/0nlSXfm6ofQtcMTh+267siCaj9hQ24134suqoHL42z0y4g==",
"dev": true,
"dependencies": {
"detect-it": "^2.0.0",
@@ -6474,8 +6677,8 @@
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"node_modules/react-modal": {
- "version": "3.14.4",
- "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==",
+ "version": "3.16.1",
+ "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
"dependencies": {
"exenv": "^1.2.0",
"prop-types": "^15.7.2",
@@ -6486,8 +6689,8 @@
"node": ">=8"
},
"peerDependencies": {
- "react": "^0.14.0 || ^15.0.0 || ^16 || ^17",
- "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17"
+ "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
+ "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
}
},
"node_modules/react-modal/node_modules/warning": {
@@ -6499,7 +6702,7 @@
},
"node_modules/react-number-input": {
"version": "15.5.1",
- "integrity": "sha1-54Ae1LFun5+6aZZNv3SsA7lw5FM=",
+ "integrity": "sha512-KeVOGdg7IHcSjaWvLRis/eTIV1dUctouQS5TvcdVF1oiXuH63bDQwBnM1Al+DXq3ZSfWC+0Th+ijyrTWjU4kKg==",
"dependencies": {
"babel-jest": "^19.0.0",
"babel-polyfill": "^6.23.0",
@@ -6510,7 +6713,7 @@
},
"node_modules/react-number-input/node_modules/babel-jest": {
"version": "19.0.0",
- "integrity": "sha1-WTI87ZmjqE01naIZyogQdP/Gzj8=",
+ "integrity": "sha512-7fL3UgmuZbgZRIj7k0fkkuC80opRoK7CvW1HqJus4zFvaR6eV9z2GeG/6uS/5XVD+h1db6C/Mz2DXKBJM2N4rg==",
"dependencies": {
"babel-core": "^6.0.0",
"babel-plugin-istanbul": "^4.0.0",
@@ -6519,7 +6722,7 @@
},
"node_modules/react-numeric-input": {
"version": "2.0.9",
- "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=",
+ "integrity": "sha512-cN8mSCd1xMNltBXxlBUSJZpDsPWDxlRg/5jmN70/TuHfxGg0O+pKRdR9z1UIq55vET4dgjr3u2DIzBIuQDUSjg==",
"dev": true,
"peerDependencies": {
"react": ">=0.14.0 || ^15.6.1"
@@ -6527,7 +6730,7 @@
},
"node_modules/react-onclickoutside": {
"version": "5.11.1",
- "integrity": "sha1-ADFOUlZ89V+rqUyrus0RlhkHBiM=",
+ "integrity": "sha512-iZKK+qUsGuqz+O3O/LtvDWkwmoqagC0EtRybhCJ3hawi9PF0ZaVrLnR24lqovbuvvUeA+cd1cWALOw+l1tfeaQ==",
"dependencies": {
"create-react-class": "^15.5.x"
}
@@ -6551,7 +6754,7 @@
},
"node_modules/react-prop-types": {
"version": "0.4.0",
- "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=",
+ "integrity": "sha512-IyjsJhDX9JkoOV9wlmLaS7z+oxYoIWhfzDcFy7inwoAKTu+VcVNrVpPmLeioJ94y6GeDRsnwarG1py5qofFQMg==",
"dependencies": {
"warning": "^3.0.0"
},
@@ -6594,9 +6797,22 @@
"react": "^0.14.0 || ^15.0.0 || ^16.0.0"
}
},
+ "node_modules/react-router-hash-link": {
+ "name": "react-router-hash-link-v2/3",
+ "resolved": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "object-assign": "^4.1.0",
+ "react": "^15.4.1",
+ "react-dom": "^15.4.1",
+ "react-interactive": "^0.4.0",
+ "react-router": "^3.0.0"
+ }
+ },
"node_modules/react-router-redux": {
"version": "4.0.8",
- "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=",
+ "integrity": "sha512-lzlK+S6jZnn17BZbzBe6F8ok3YAhGAUlyWgRu3cz5mT199gKxfem5lNu3qcgzRiVhNEOFVG0/pdT+1t4aWhoQw==",
"dev": true
},
"node_modules/react-scrollspy": {
@@ -6654,7 +6870,7 @@
},
"node_modules/read-file-stdin": {
"version": "0.2.1",
- "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
+ "integrity": "sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==",
"dev": true,
"dependencies": {
"gather-stream": "^1.0.0"
@@ -6662,7 +6878,7 @@
},
"node_modules/read-pkg": {
"version": "1.1.0",
- "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+ "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
"dependencies": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
@@ -6674,7 +6890,7 @@
},
"node_modules/read-pkg-up": {
"version": "1.0.1",
- "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+ "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
"dependencies": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
@@ -6684,8 +6900,8 @@
}
},
"node_modules/readable-stream": {
- "version": "3.6.0",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.2",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
@@ -6711,7 +6927,7 @@
},
"node_modules/readdirp/node_modules/arr-diff": {
"version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -6719,7 +6935,7 @@
},
"node_modules/readdirp/node_modules/array-unique": {
"version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -6747,7 +6963,7 @@
},
"node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -6758,7 +6974,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets": {
"version": "2.1.4",
- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
"dev": true,
"dependencies": {
"debug": "^2.3.3",
@@ -6775,7 +6991,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dev": true,
"dependencies": {
"is-descriptor": "^0.1.0"
@@ -6786,7 +7002,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -6836,7 +7052,7 @@
},
"node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dev": true,
"dependencies": {
"is-descriptor": "^1.0.0"
@@ -6847,7 +7063,7 @@
},
"node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -6858,7 +7074,7 @@
},
"node_modules/readdirp/node_modules/fill-range": {
"version": "4.0.0",
- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
"dev": true,
"dependencies": {
"extend-shallow": "^2.0.1",
@@ -6872,7 +7088,7 @@
},
"node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -6883,7 +7099,7 @@
},
"node_modules/readdirp/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -6894,7 +7110,7 @@
},
"node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dev": true,
"dependencies": {
"is-buffer": "^1.1.5"
@@ -6905,7 +7121,7 @@
},
"node_modules/readdirp/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -6916,7 +7132,7 @@
},
"node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dev": true,
"dependencies": {
"is-buffer": "^1.1.5"
@@ -6927,7 +7143,7 @@
},
"node_modules/readdirp/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -6938,7 +7154,7 @@
},
"node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dev": true,
"dependencies": {
"is-buffer": "^1.1.5"
@@ -6949,7 +7165,7 @@
},
"node_modules/readdirp/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -6987,8 +7203,8 @@
}
},
"node_modules/readdirp/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -7000,6 +7216,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/readdirp/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/readdirp/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -7010,7 +7231,7 @@
},
"node_modules/reduce-css-calc": {
"version": "1.3.0",
- "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+ "integrity": "sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==",
"dev": true,
"dependencies": {
"balanced-match": "^0.4.2",
@@ -7020,7 +7241,7 @@
},
"node_modules/reduce-css-calc/node_modules/balanced-match": {
"version": "0.4.2",
- "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+ "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg==",
"dev": true
},
"node_modules/reduce-function-call": {
@@ -7049,7 +7270,7 @@
},
"node_modules/redux-logger": {
"version": "2.10.2",
- "integrity": "sha1-PFpfCm8yV3wd6t9mVfJX+CxsOTc=",
+ "integrity": "sha512-Pfl6EPSjM5IJ23Jl/FpGos+zCnMfIdepY4CUOeaNOymVucKKa2XIrPQfYeGfZwRmiTbcZ6XdqYZ0it4GE3kT8w==",
"dev": true,
"dependencies": {
"deep-diff": "0.3.4"
@@ -7057,7 +7278,7 @@
},
"node_modules/redux-thunk": {
"version": "2.2.0",
- "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU=",
+ "integrity": "sha512-OOFWh9mt/7i94QPq4IAxhSIUyfIJJRnk6pe1IwgXethQik3kyg1wuxVZZlW9QOmL5rP/MrwzV+Cb+/HBKlvM8Q==",
"dev": true
},
"node_modules/regenerate": {
@@ -7067,7 +7288,7 @@
},
"node_modules/regenerator-runtime": {
"version": "0.10.5",
- "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+ "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w=="
},
"node_modules/regenerator-transform": {
"version": "0.10.1",
@@ -7103,7 +7324,7 @@
},
"node_modules/regexpu-core": {
"version": "2.0.0",
- "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+ "integrity": "sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ==",
"dev": true,
"dependencies": {
"regenerate": "^1.2.1",
@@ -7113,12 +7334,12 @@
},
"node_modules/regjsgen": {
"version": "0.2.0",
- "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+ "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==",
"dev": true
},
"node_modules/regjsparser": {
"version": "0.1.5",
- "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+ "integrity": "sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==",
"dev": true,
"dependencies": {
"jsesc": "~0.5.0"
@@ -7129,7 +7350,7 @@
},
"node_modules/regjsparser/node_modules/jsesc": {
"version": "0.5.0",
- "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
"dev": true,
"bin": {
"jsesc": "bin/jsesc"
@@ -7137,7 +7358,7 @@
},
"node_modules/remove-trailing-separator": {
"version": "1.1.0",
- "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
},
"node_modules/repeat-element": {
"version": "1.1.4",
@@ -7148,14 +7369,14 @@
},
"node_modules/repeat-string": {
"version": "1.6.1",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+ "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/repeating": {
"version": "2.0.1",
- "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+ "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
"dependencies": {
"is-finite": "^1.0.0"
},
@@ -7196,18 +7417,22 @@
},
"node_modules/require-main-filename": {
"version": "1.0.1",
- "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="
},
"node_modules/requires-port": {
"version": "1.0.0",
- "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
"dev": true
},
+ "node_modules/reselect": {
+ "version": "4.1.8",
+ "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
+ },
"node_modules/resolve": {
- "version": "1.22.0",
- "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+ "version": "1.22.6",
+ "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
"dependencies": {
- "is-core-module": "^2.8.1",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
@@ -7220,7 +7445,7 @@
},
"node_modules/resolve-url": {
"version": "0.2.1",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+ "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
"deprecated": "https://github.com/lydell/resolve-url#deprecated",
"dev": true
},
@@ -7234,7 +7459,7 @@
},
"node_modules/right-align": {
"version": "0.1.3",
- "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+ "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
"dev": true,
"dependencies": {
"align-text": "^0.1.1"
@@ -7254,13 +7479,13 @@
}
},
"node_modules/rimraf/node_modules/glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
},
@@ -7273,23 +7498,37 @@
},
"node_modules/ripemd160": {
"version": "0.2.0",
- "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
+ "integrity": "sha512-JJsJ74Mw4sUDDisXGDnNNyN9xWmt5HcH6Kwvb/0m/IvTKjnLAtZfzeoLdpxk44AxQZki54oCCd+Kt0nPQ2AF2g==",
"dev": true
},
"node_modules/run-queue": {
"version": "1.0.3",
- "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+ "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
"dependencies": {
"aproba": "^1.1.1"
}
},
"node_modules/safe-buffer": {
- "version": "5.1.2",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ "version": "5.2.1",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
},
"node_modules/safe-regex": {
"version": "1.1.0",
- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+ "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
"dev": true,
"dependencies": {
"ret": "~0.1.10"
@@ -7301,7 +7540,7 @@
},
"node_modules/sane": {
"version": "1.7.0",
- "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=",
+ "integrity": "sha512-wxna76E1fVwXoNSUfSDGB1KKY/+ZIydOdQoFnMloJZTrkuJI4Twkr+2qn864GkzzPwXATHRUwhF9OpQWzIN+Kw==",
"deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
"dev": true,
"dependencies": {
@@ -7321,8 +7560,9 @@
}
},
"node_modules/sax": {
- "version": "1.2.4",
- "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
"dev": true
},
"node_modules/schema-utils": {
@@ -7337,30 +7577,30 @@
}
},
"node_modules/semver": {
- "version": "5.7.1",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"bin": {
"semver": "bin/semver"
}
},
"node_modules/send": {
- "version": "0.17.2",
- "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+ "version": "0.18.0",
+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
"dev": true,
"dependencies": {
"debug": "2.6.9",
- "depd": "~1.1.2",
- "destroy": "~1.0.4",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"mime": "1.6.0",
"ms": "2.1.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"range-parser": "~1.2.1",
- "statuses": "~1.5.0"
+ "statuses": "2.0.1"
},
"engines": {
"node": ">= 0.8.0"
@@ -7377,7 +7617,7 @@
},
"node_modules/serve-index": {
"version": "1.9.1",
- "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+ "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
"dev": true,
"dependencies": {
"accepts": "~1.3.4",
@@ -7392,9 +7632,17 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/serve-index/node_modules/depd": {
+ "version": "1.1.2",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/serve-index/node_modules/http-errors": {
"version": "1.6.3",
- "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+ "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
"dev": true,
"dependencies": {
"depd": "~1.1.2",
@@ -7408,7 +7656,7 @@
},
"node_modules/serve-index/node_modules/inherits": {
"version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
"dev": true
},
"node_modules/serve-index/node_modules/setprototypeof": {
@@ -7416,28 +7664,28 @@
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
"dev": true
},
+ "node_modules/serve-index/node_modules/statuses": {
+ "version": "1.5.0",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/serve-static": {
- "version": "1.14.2",
- "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+ "version": "1.15.0",
+ "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
"dev": true,
"dependencies": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.3",
- "send": "0.17.2"
+ "send": "0.18.0"
},
"engines": {
"node": ">= 0.8.0"
}
},
- "node_modules/set-immediate-shim": {
- "version": "1.0.1",
- "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/set-value": {
"version": "2.0.1",
"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
@@ -7454,7 +7702,7 @@
},
"node_modules/set-value/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -7465,7 +7713,7 @@
},
"node_modules/setimmediate": {
"version": "1.0.5",
- "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
},
"node_modules/setprototypeof": {
"version": "1.2.0",
@@ -7474,7 +7722,7 @@
},
"node_modules/sha.js": {
"version": "2.2.6",
- "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
+ "integrity": "sha512-GC+qN4sf/O6bDwz6CHaz8HVQfLbbNyIsXpTZLiD5c1badnWA63WVAH1msoCq+fXcV0dZ50jxTqKA8seu40845A==",
"dev": true,
"bin": {
"sha.js": "bin.js"
@@ -7484,9 +7732,22 @@
"version": "1.1.0",
"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
},
+ "node_modules/side-channel": {
+ "version": "1.0.4",
+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/slash": {
"version": "1.0.0",
- "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+ "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
"engines": {
"node": ">=0.10.0"
}
@@ -7524,7 +7785,7 @@
},
"node_modules/snapdragon-node/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dev": true,
"dependencies": {
"is-descriptor": "^1.0.0"
@@ -7535,7 +7796,7 @@
},
"node_modules/snapdragon-node/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -7554,7 +7815,7 @@
},
"node_modules/snapdragon/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dev": true,
"dependencies": {
"is-descriptor": "^0.1.0"
@@ -7565,7 +7826,7 @@
},
"node_modules/snapdragon/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dev": true,
"dependencies": {
"is-extendable": "^0.1.0"
@@ -7576,7 +7837,7 @@
},
"node_modules/snapdragon/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -7587,7 +7848,7 @@
},
"node_modules/snapdragon/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -7619,7 +7880,7 @@
},
"node_modules/sntp": {
"version": "1.0.9",
- "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+ "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
"deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
"dev": true,
"optional": true,
@@ -7641,16 +7902,21 @@
}
},
"node_modules/sockjs-client": {
- "version": "1.5.2",
- "integrity": "sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==",
+ "version": "1.6.1",
+ "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==",
"dev": true,
"dependencies": {
- "debug": "^3.2.6",
- "eventsource": "^1.0.7",
- "faye-websocket": "^0.11.3",
+ "debug": "^3.2.7",
+ "eventsource": "^2.0.2",
+ "faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
- "json3": "^3.3.3",
- "url-parse": "^1.5.3"
+ "url-parse": "^1.5.10"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://tidelift.com/funding/github/npm/sockjs-client"
}
},
"node_modules/sockjs-client/node_modules/debug": {
@@ -7676,7 +7942,7 @@
},
"node_modules/sort-keys": {
"version": "1.1.2",
- "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+ "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
"dev": true,
"dependencies": {
"is-plain-obj": "^1.0.0"
@@ -7687,16 +7953,82 @@
},
"node_modules/source-list-map": {
"version": "0.1.8",
- "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+ "integrity": "sha512-cabwdhnSNf/tTDMh/DXZXlkeQLvdYT5xfGYBohqHG7wb3bBQrQlHQNWM9NWSOboXXK1zgwz6JzS5e4hZq9vxMw==",
"dev": true
},
"node_modules/source-map": {
"version": "0.5.7",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/source-map-loader": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+ "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+ "dev": true,
+ "dependencies": {
+ "async": "^2.5.0",
+ "loader-utils": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/source-map-loader/node_modules/async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "node_modules/source-map-loader/node_modules/big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/source-map-loader/node_modules/emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/source-map-loader/node_modules/json5": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.0"
+ },
+ "bin": {
+ "json5": "lib/cli.js"
+ }
+ },
+ "node_modules/source-map-loader/node_modules/loader-utils": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+ "dev": true,
+ "dependencies": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
"node_modules/source-map-resolve": {
"version": "0.5.3",
"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
@@ -7724,8 +8056,8 @@
"dev": true
},
"node_modules/spdx-correct": {
- "version": "3.1.1",
- "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "version": "3.2.0",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
"dependencies": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -7744,8 +8076,8 @@
}
},
"node_modules/spdx-license-ids": {
- "version": "3.0.11",
- "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="
+ "version": "3.0.16",
+ "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
},
"node_modules/split-string": {
"version": "3.1.0",
@@ -7760,7 +8092,7 @@
},
"node_modules/sprintf-js": {
"version": "1.0.3",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
"dev": true
},
"node_modules/sshpk": {
@@ -7796,7 +8128,7 @@
},
"node_modules/static-extend": {
"version": "0.1.2",
- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+ "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
"dev": true,
"dependencies": {
"define-property": "^0.2.5",
@@ -7808,7 +8140,7 @@
},
"node_modules/static-extend/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dev": true,
"dependencies": {
"is-descriptor": "^0.1.0"
@@ -7819,7 +8151,7 @@
},
"node_modules/static-extend/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -7830,7 +8162,7 @@
},
"node_modules/static-extend/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -7861,11 +8193,11 @@
}
},
"node_modules/statuses": {
- "version": "1.5.0",
- "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+ "version": "2.0.1",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
"dev": true,
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/stream-browserify": {
@@ -7878,8 +8210,8 @@
}
},
"node_modules/stream-browserify/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -7891,6 +8223,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/stream-browserify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/stream-browserify/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -7901,7 +8238,7 @@
},
"node_modules/stream-cache": {
"version": "0.0.2",
- "integrity": "sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=",
+ "integrity": "sha512-FsMTiRi4aXOcbL3M2lh7yAOWqM7kfVWQfkJ6kelrhdKNpJJVm0IebICQ2LURsbC5w9XfPSRwd9DkfqDHR9OP3g==",
"dev": true,
"engines": {
"node": "*"
@@ -7928,8 +8265,8 @@
}
},
"node_modules/stream-http/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -7941,6 +8278,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/stream-http/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/stream-http/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -7955,7 +8297,7 @@
},
"node_modules/strict-uri-encode": {
"version": "1.1.0",
- "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+ "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -7969,25 +8311,6 @@
"safe-buffer": "~5.2.0"
}
},
- "node_modules/string_decoder/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/stringstream": {
"version": "0.0.6",
"integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
@@ -7996,7 +8319,7 @@
},
"node_modules/strip-ansi": {
"version": "3.0.1",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
"dependencies": {
"ansi-regex": "^2.0.0"
},
@@ -8006,7 +8329,7 @@
},
"node_modules/strip-bom": {
"version": "2.0.0",
- "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+ "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
"dependencies": {
"is-utf8": "^0.2.0"
},
@@ -8016,7 +8339,7 @@
},
"node_modules/style-loader": {
"version": "0.12.4",
- "integrity": "sha1-rn0GZdxNxlPaov6Xu5CRS8HSLZs=",
+ "integrity": "sha512-co82PY8WzQzvJPbmN97mkqIa6lBAa9N6azZUmMsS4Ezk7P6t01ejb9GpOeN5JY/0gcWBmCzyJIMJHcs/7rBaBA==",
"dev": true,
"dependencies": {
"loader-utils": "^0.2.7"
@@ -8024,7 +8347,7 @@
},
"node_modules/supports-color": {
"version": "2.0.0",
- "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
"engines": {
"node": ">=0.8.0"
}
@@ -8054,7 +8377,7 @@
},
"node_modules/tapable": {
"version": "0.1.10",
- "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+ "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
"dev": true,
"engines": {
"node": ">=0.6"
@@ -8073,7 +8396,7 @@
},
"node_modules/through": {
"version": "2.3.8",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
"dev": true
},
"node_modules/through2": {
@@ -8085,8 +8408,8 @@
}
},
"node_modules/through2/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -8097,6 +8420,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/through2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/through2/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -8130,19 +8457,19 @@
},
"node_modules/to-arraybuffer": {
"version": "1.0.1",
- "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+ "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
"dev": true
},
"node_modules/to-fast-properties": {
"version": "1.0.3",
- "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+ "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/to-object-path": {
"version": "0.3.0",
- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+ "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -8167,7 +8494,7 @@
},
"node_modules/to-regex-range": {
"version": "2.1.1",
- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+ "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
"dev": true,
"dependencies": {
"is-number": "^3.0.0",
@@ -8179,7 +8506,7 @@
},
"node_modules/to-regex-range/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dev": true,
"dependencies": {
"kind-of": "^3.0.2"
@@ -8210,24 +8537,24 @@
},
"node_modules/tr46": {
"version": "0.0.3",
- "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
"dev": true
},
"node_modules/trim-right": {
"version": "1.0.1",
- "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+ "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/tty-browserify": {
"version": "0.0.0",
- "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+ "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
"dev": true
},
"node_modules/tunnel-agent": {
"version": "0.6.0",
- "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
"dev": true,
"dependencies": {
"safe-buffer": "^5.0.1"
@@ -8238,12 +8565,12 @@
},
"node_modules/tweetnacl": {
"version": "0.14.5",
- "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
"dev": true
},
"node_modules/type-check": {
"version": "0.3.2",
- "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
"dev": true,
"dependencies": {
"prelude-ls": "~1.1.2"
@@ -8266,11 +8593,11 @@
},
"node_modules/typedarray": {
"version": "0.0.6",
- "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
},
"node_modules/ua-parser-js": {
- "version": "0.7.31",
- "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+ "version": "0.7.36",
+ "integrity": "sha512-CPPLoCts2p7D8VbybttE3P2ylv0OBZEAy7a12DsulIEcAiMtWJy+PBgMXgWDI80D5UwqE8oQPHYnk13tm38M2Q==",
"funding": [
{
"type": "opencollective",
@@ -8279,6 +8606,10 @@
{
"type": "paypal",
"url": "https://paypal.me/faisalman"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/faisalman"
}
],
"engines": {
@@ -8308,8 +8639,8 @@
}
},
"node_modules/uglify-js": {
- "version": "3.15.1",
- "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+ "version": "3.17.4",
+ "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
"dev": true,
"optional": true,
"bin": {
@@ -8321,7 +8652,7 @@
},
"node_modules/uglify-to-browserify": {
"version": "1.0.2",
- "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+ "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
"dev": true
},
"node_modules/uglifyjs-webpack-plugin": {
@@ -8346,7 +8677,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/find-cache-dir": {
"version": "1.0.0",
- "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+ "integrity": "sha512-46TFiBOzX7xq/PcSWfFwkyjpemdRnMe31UQF+os0y+1W3k95f6R4SEt02Hj4p3X0Mir9gfrkmOtshFidS0VPUg==",
"dependencies": {
"commondir": "^1.0.1",
"make-dir": "^1.0.0",
@@ -8358,7 +8689,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
"dependencies": {
"locate-path": "^2.0.0"
},
@@ -8368,7 +8699,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/pkg-dir": {
"version": "2.0.0",
- "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+ "integrity": "sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw==",
"dependencies": {
"find-up": "^2.1.0"
},
@@ -8396,7 +8727,7 @@
},
"node_modules/underscore": {
"version": "1.2.4",
- "integrity": "sha1-6NpiQaoG9k3yRzuyWQuMF8hMPH4=",
+ "integrity": "sha512-WvFu6gnoSYDtm/hncQgO00QgFTxlmiw2Uv3DoU7yq5aLD4RhX7cUHO4TDU53JWy5E63Ex4yYsm1+9t2cZvefnQ==",
"dev": true,
"engines": {
"node": "*"
@@ -8404,7 +8735,7 @@
},
"node_modules/underscore.string": {
"version": "2.0.0",
- "integrity": "sha1-dHCFilSguzVg0DfaVtzGe1GB4Ro=",
+ "integrity": "sha512-36kUytY+40vDx+/MqchfGG6/QDy/FZPR0RY/vKIEU55yAvxivOwE46rIKMQ2uCIfwjxbI0PQpmljQ2MK80oYDA==",
"dev": true,
"engines": {
"node": "*"
@@ -8426,17 +8757,17 @@
},
"node_modules/uniq": {
"version": "1.0.1",
- "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+ "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
"dev": true
},
"node_modules/uniqid": {
"version": "1.0.0",
- "integrity": "sha1-JYJSTgdASESkLelPviv1SeG3RVU=",
+ "integrity": "sha512-o4DUU+v9cDISafUcACPKtwyTAnJjPoX75L725BabYxoXoN/D41jRiLEDV3GPQotU6LR36xtYPifprxLEG4OJ6g==",
"dev": true
},
"node_modules/uniqs": {
"version": "2.0.0",
- "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+ "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
"dev": true
},
"node_modules/unique-filename": {
@@ -8455,7 +8786,7 @@
},
"node_modules/unpipe": {
"version": "1.0.0",
- "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -8463,7 +8794,7 @@
},
"node_modules/unset-value": {
"version": "1.0.0",
- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+ "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
"dev": true,
"dependencies": {
"has-value": "^0.3.1",
@@ -8475,7 +8806,7 @@
},
"node_modules/unset-value/node_modules/has-value": {
"version": "0.3.1",
- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
"dev": true,
"dependencies": {
"get-value": "^2.0.3",
@@ -8488,7 +8819,7 @@
},
"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
"dev": true,
"dependencies": {
"isarray": "1.0.0"
@@ -8499,7 +8830,7 @@
},
"node_modules/unset-value/node_modules/has-values": {
"version": "0.1.4",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -8507,7 +8838,7 @@
},
"node_modules/unset-value/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -8522,22 +8853,22 @@
},
"node_modules/urix": {
"version": "0.1.0",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+ "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
"deprecated": "Please see https://github.com/lydell/urix#deprecated",
"dev": true
},
"node_modules/url": {
- "version": "0.11.0",
- "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+ "version": "0.11.3",
+ "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
"dev": true,
"dependencies": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "punycode": "^1.4.1",
+ "qs": "^6.11.2"
}
},
"node_modules/url-parse": {
- "version": "1.5.9",
- "integrity": "sha512-HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==",
+ "version": "1.5.10",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"dev": true,
"dependencies": {
"querystringify": "^2.1.1",
@@ -8545,10 +8876,24 @@
}
},
"node_modules/url/node_modules/punycode": {
- "version": "1.3.2",
- "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+ "version": "1.4.1",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true
},
+ "node_modules/url/node_modules/qs": {
+ "version": "6.11.2",
+ "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+ "dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/use": {
"version": "3.1.1",
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
@@ -8567,16 +8912,16 @@
},
"node_modules/util-deprecate": {
"version": "1.0.2",
- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
},
"node_modules/util/node_modules/inherits": {
"version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
"dev": true
},
"node_modules/utils-merge": {
"version": "1.0.1",
- "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
"dev": true,
"engines": {
"node": ">= 0.4.0"
@@ -8601,7 +8946,7 @@
},
"node_modules/vary": {
"version": "1.1.2",
- "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -8609,7 +8954,7 @@
},
"node_modules/verror": {
"version": "1.10.0",
- "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
"dev": true,
"engines": [
"node >=0.6.0"
@@ -8622,7 +8967,7 @@
},
"node_modules/vm-browserify": {
"version": "0.0.4",
- "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+ "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
"dev": true,
"dependencies": {
"indexof": "0.0.1"
@@ -8638,14 +8983,14 @@
},
"node_modules/warning": {
"version": "3.0.0",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+ "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==",
"dependencies": {
"loose-envify": "^1.0.0"
}
},
"node_modules/watch": {
"version": "0.10.0",
- "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw=",
+ "integrity": "sha512-FAk18nzhYggg939xgRRLJjvqmAKZciO24wr8neoxNPl87w8J3m784wxL4zFBwME+0gNQ2Sv/vfsCrUxPxU2Dmg==",
"dev": true,
"engines": [
"node >=0.1.95"
@@ -8653,7 +8998,7 @@
},
"node_modules/watchpack": {
"version": "0.2.9",
- "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
+ "integrity": "sha512-hmLWdxNfe0Ou1xaRj+ublbOYUaZJfVz1VuHQfERLVlUrLS21gUaGa2gWRl8L5Ej1aUS3KxFN+1qoWK4kZLMvKw==",
"dev": true,
"dependencies": {
"async": "^0.9.0",
@@ -8663,12 +9008,12 @@
},
"node_modules/watchpack/node_modules/async": {
"version": "0.9.2",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+ "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
"dev": true
},
"node_modules/webpack": {
"version": "1.15.0",
- "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
+ "integrity": "sha512-+8bxNSHMZCWBa6hi++2A2pw9GmLUWY6lII+aIXlgUPpB+ClNrUKgP8hx0w+hxjWhX81hclUYPGFg+7NxgLTUYQ==",
"dev": true,
"dependencies": {
"acorn": "^3.0.0",
@@ -8696,7 +9041,7 @@
},
"node_modules/webpack-core": {
"version": "0.6.9",
- "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+ "integrity": "sha512-P6ZUGXn5buTEZyTStCHHLwtWGKSm/jA629Zgp4pcHSsy60CCsT9MaHDxNIPL+GGJ2KwOgI6ORwQtHcrYHAt2UQ==",
"dev": true,
"dependencies": {
"source-list-map": "~0.1.7",
@@ -8708,7 +9053,7 @@
},
"node_modules/webpack-core/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -8737,7 +9082,7 @@
},
"node_modules/webpack-dev-middleware/node_modules/memory-fs": {
"version": "0.4.1",
- "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+ "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
"dev": true,
"dependencies": {
"errno": "^0.1.3",
@@ -8745,8 +9090,8 @@
}
},
"node_modules/webpack-dev-middleware/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -8758,6 +9103,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/webpack-dev-middleware/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/webpack-dev-middleware/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -8768,7 +9118,7 @@
},
"node_modules/webpack-dev-server": {
"version": "1.16.5",
- "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=",
+ "integrity": "sha512-on9j8SBuJXa2lzyIAv0DasJT8SteshUrEjjKc/mc8D68U7RN0mIBZksAcjnPW72RSJa9scWZ+C+Dme76LDH+lA==",
"dev": true,
"dependencies": {
"compression": "^1.5.2",
@@ -8794,7 +9144,7 @@
},
"node_modules/webpack-dev-server/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"dependencies": {
"has-flag": "^1.0.0"
@@ -8824,7 +9174,7 @@
},
"node_modules/webpack/node_modules/acorn": {
"version": "3.3.0",
- "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+ "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -8835,7 +9185,7 @@
},
"node_modules/webpack/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"dependencies": {
"has-flag": "^1.0.0"
@@ -8846,7 +9196,7 @@
},
"node_modules/webpack/node_modules/uglify-js": {
"version": "2.7.5",
- "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
+ "integrity": "sha512-RvbIYn4DIadCg1MV7YP7OrpxnVrtEieZzbK0KSQvwWGAHojqWJxInkQhmtYGRo9PTwwkJkljIgzMyA1VitEc4Q==",
"dev": true,
"dependencies": {
"async": "~0.2.6",
@@ -8863,7 +9213,7 @@
},
"node_modules/webpack/node_modules/uglify-js/node_modules/async": {
"version": "0.2.10",
- "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+ "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
"dev": true
},
"node_modules/websocket-driver": {
@@ -8889,12 +9239,12 @@
},
"node_modules/whatwg-fetch": {
"version": "0.9.0",
- "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=",
+ "integrity": "sha512-DIuh7/cloHxHYwS/oRXGgkALYAntijL63nsgMQsNSnBj825AysosAqA2ZbYXGRqpPRiNH7335dTqV364euRpZw==",
"dev": true
},
"node_modules/whatwg-url-compat": {
"version": "0.6.5",
- "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=",
+ "integrity": "sha512-vbg5+JVNwGtHRI3GheZGWrcUlxF9BXHbA80dLa+2XqJjlV/BK6upoi2j8dIRW9FGPUUyaMm7Hf1pTexHnsk85g==",
"dev": true,
"dependencies": {
"tr46": "~0.0.1"
@@ -8913,7 +9263,7 @@
},
"node_modules/window-size": {
"version": "0.1.0",
- "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+ "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
"dev": true,
"engines": {
"node": ">= 0.8.0"
@@ -8921,7 +9271,7 @@
},
"node_modules/wordwrap": {
"version": "1.0.0",
- "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
"dev": true
},
"node_modules/worker-farm": {
@@ -8933,20 +9283,22 @@
},
"node_modules/wrappy": {
"version": "1.0.2",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"node_modules/write-file-stdout": {
"version": "0.0.2",
- "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
+ "integrity": "sha512-KofbSPeePSre3soWCMaqcWHVZy9t/rbJaEMa2h19cupODsvc4eh7390Se1TjzZEL77rS+D6dznu0TLXyCbR+sw==",
"dev": true
},
"node_modules/xml": {
"version": "1.0.1",
- "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
"dev": true
},
"node_modules/xml-js": {
"version": "1.6.11",
+ "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
"integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
"dev": true,
"dependencies": {
@@ -8958,12 +9310,12 @@
},
"node_modules/xml-name-validator": {
"version": "2.0.1",
- "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
+ "integrity": "sha512-jRKe/iQYMyVJpzPH+3HL97Lgu5HrCfii+qSo+TfjKHtOnvbnvdVfMYrn9Q34YV81M2e5sviJlI6Ko9y+nByzvA==",
"dev": true
},
"node_modules/xmlhttprequest": {
"version": "1.8.0",
- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+ "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==",
"dev": true,
"engines": {
"node": ">=0.4.0"
@@ -8982,11 +9334,11 @@
},
"node_modules/yallist": {
"version": "2.1.2",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
},
"node_modules/yargs": {
"version": "3.10.0",
- "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+ "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
"dev": true,
"dependencies": {
"camelcase": "^1.0.2",
@@ -9022,32 +9374,34 @@
}
},
"@babel/runtime": {
- "version": "7.17.2",
+ "version": "7.23.1",
"requires": {
- "regenerator-runtime": "^0.13.4"
+ "regenerator-runtime": "^0.14.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.13.9"
+ "version": "0.14.0"
}
}
},
"@babel/runtime-corejs2": {
- "version": "7.17.2",
+ "version": "7.23.1",
"dev": true,
"requires": {
- "core-js": "^2.6.5",
- "regenerator-runtime": "^0.13.4"
+ "core-js": "^2.6.12",
+ "regenerator-runtime": "^0.14.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.13.9",
+ "version": "0.14.0",
"dev": true
}
}
},
"@types/image-size": {
"version": "0.0.29",
+ "resolved": "https://registry.npmjs.org/@types/image-size/-/image-size-0.0.29.tgz",
+ "integrity": "sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg==",
"dev": true,
"requires": {
"@types/node": "*"
@@ -9055,13 +9409,17 @@
},
"@types/jszip": {
"version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.4.1.tgz",
+ "integrity": "sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A==",
"dev": true,
"requires": {
"jszip": "*"
}
},
"@types/node": {
- "version": "17.0.19",
+ "version": "20.8.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
+ "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
"dev": true
},
"abbrev": {
@@ -9119,30 +9477,16 @@
"dev": true
},
"amp-ui": {
- "version": "git+ssh://git@github.com/devgateway/amp-ui.git#bc63cd7e9b1dd2add7375e3ae21ab4b45cfc062f",
+ "version": "git+ssh://git@github.com/devgateway/amp-ui.git#610fb5ec861a7e2cf356496180bfdca974be1f39",
"dev": true,
- "from": "amp-ui@git+ssh://github.com/devgateway/amp-ui#develop",
+ "from": "amp-ui@github:devgateway/amp-ui#develop",
"requires": {
"docx": "^4.7.1",
- "file-saver": "git+ssh://github.com/devgateway/FileSaver.js",
+ "file-saver": "github:devgateway/FileSaver.js",
"fs": "0.0.1-security",
"he": "^1.2.0",
"moment": "^2.18.1",
"react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3"
- },
- "dependencies": {
- "react-router-hash-link": {
- "version": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
- "dev": true,
- "from": "react-router-hash-link@git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3",
- "requires": {
- "object-assign": "^4.1.0",
- "react": "^15.4.1",
- "react-dom": "^15.4.1",
- "react-interactive": "^0.4.0",
- "react-router": "^3.0.0"
- }
- }
}
},
"ansi-regex": {
@@ -9203,24 +9547,11 @@
}
},
"assert": {
- "version": "1.5.0",
+ "version": "1.5.1",
"dev": true,
"requires": {
- "object-assign": "^4.1.1",
- "util": "0.10.3"
- },
- "dependencies": {
- "inherits": {
- "version": "2.0.1",
- "dev": true
- },
- "util": {
- "version": "0.10.3",
- "dev": true,
- "requires": {
- "inherits": "2.0.1"
- }
- }
+ "object.assign": "^4.1.4",
+ "util": "^0.10.4"
}
},
"assert-plus": {
@@ -9236,7 +9567,7 @@
"dev": true
},
"async-each": {
- "version": "1.0.3",
+ "version": "1.0.6",
"dev": true
},
"asynckit": {
@@ -9262,7 +9593,7 @@
"dev": true
},
"aws4": {
- "version": "1.11.0",
+ "version": "1.12.0",
"dev": true
},
"babel-code-frame": {
@@ -10115,19 +10446,21 @@
"version": "3.7.2"
},
"body-parser": {
- "version": "1.19.2",
+ "version": "1.20.1",
"dev": true,
"requires": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "http-errors": "1.8.1",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
- "on-finished": "~2.3.0",
- "qs": "6.9.7",
- "raw-body": "2.4.3",
- "type-is": "~1.6.18"
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
},
"dependencies": {
"bytes": {
@@ -10142,8 +10475,11 @@
}
},
"qs": {
- "version": "6.9.7",
- "dev": true
+ "version": "6.11.0",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
@@ -10256,12 +10592,12 @@
},
"dependencies": {
"glob": {
- "version": "7.2.0",
+ "version": "7.2.3",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
@@ -10289,12 +10625,20 @@
}
}
},
+ "call-bind": {
+ "version": "1.0.2",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ }
+ },
"camelcase": {
"version": "1.2.1",
"dev": true
},
"caniuse-db": {
- "version": "1.0.30001312",
+ "version": "1.0.30001546",
"dev": true
},
"caseless": {
@@ -10390,7 +10734,7 @@
}
},
"classnames": {
- "version": "2.3.1"
+ "version": "2.3.2"
},
"cli-table": {
"version": "0.0.2",
@@ -10528,6 +10872,12 @@
"on-headers": "~1.0.2",
"safe-buffer": "5.1.2",
"vary": "~1.1.2"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ }
}
},
"concat-map": {
@@ -10543,7 +10893,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -10554,6 +10904,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -10579,26 +10932,17 @@
"dev": true,
"requires": {
"safe-buffer": "5.2.1"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.2.1",
- "dev": true
- }
}
},
"content-type": {
- "version": "1.0.4",
+ "version": "1.0.5",
"dev": true
},
"convert-source-map": {
- "version": "1.8.0",
- "requires": {
- "safe-buffer": "~5.1.1"
- }
+ "version": "1.9.0"
},
"cookie": {
- "version": "0.4.2",
+ "version": "0.5.0",
"dev": true
},
"cookie-signature": {
@@ -10749,7 +11093,7 @@
}
},
"cyclist": {
- "version": "1.0.1"
+ "version": "1.0.2"
},
"dashdash": {
"version": "1.14.1",
@@ -10769,7 +11113,7 @@
"dev": true
},
"decode-uri-component": {
- "version": "0.2.0",
+ "version": "0.2.2",
"dev": true
},
"deep-diff": {
@@ -10780,6 +11124,24 @@
"version": "0.1.4",
"dev": true
},
+ "define-data-property": {
+ "version": "1.1.0",
+ "dev": true,
+ "requires": {
+ "get-intrinsic": "^1.2.1",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.2.1",
+ "dev": true,
+ "requires": {
+ "define-data-property": "^1.0.1",
+ "has-property-descriptors": "^1.0.0",
+ "object-keys": "^1.1.1"
+ }
+ },
"define-property": {
"version": "2.0.2",
"dev": true,
@@ -10795,7 +11157,7 @@
}
},
"defined": {
- "version": "1.0.0",
+ "version": "1.0.1",
"dev": true
},
"delayed-stream": {
@@ -10803,15 +11165,17 @@
"dev": true
},
"depd": {
- "version": "1.1.2",
+ "version": "2.0.0",
"dev": true
},
"destroy": {
- "version": "1.0.4",
+ "version": "1.2.0",
"dev": true
},
"detect-hover": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-hover/-/detect-hover-1.0.3.tgz",
+ "integrity": "sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==",
"dev": true
},
"detect-indent": {
@@ -10822,6 +11186,8 @@
},
"detect-it": {
"version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/detect-it/-/detect-it-2.1.1.tgz",
+ "integrity": "sha512-ZBC+LVUG18aBmw4JRakDM5fI7kYcsbwpJTVuU6za7cWRfyzzhVbIWZVayGnon1xFeIGxFN3jiZ8QON3YteUyCw==",
"dev": true,
"requires": {
"detect-hover": "^1.0.1",
@@ -10832,14 +11198,20 @@
},
"detect-passive-events": {
"version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/detect-passive-events/-/detect-passive-events-1.0.5.tgz",
+ "integrity": "sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==",
"dev": true
},
"detect-pointer": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-pointer/-/detect-pointer-1.0.3.tgz",
+ "integrity": "sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==",
"dev": true
},
"detect-touch-events": {
"version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/detect-touch-events/-/detect-touch-events-1.0.1.tgz",
+ "integrity": "sha512-ZYSP1bEs68q4fICiaTepdEjwBR4Ybg7rCQfMySP5IrO3V+7smmaqVjcvQdo+wENCQT/rdEWnB+E+ugIq4s1TdA==",
"dev": true
},
"diff": {
@@ -10848,6 +11220,8 @@
},
"docx": {
"version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/docx/-/docx-4.7.1.tgz",
+ "integrity": "sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw==",
"dev": true,
"requires": {
"@types/image-size": "0.0.29",
@@ -10873,7 +11247,7 @@
},
"dependencies": {
"domelementtype": {
- "version": "2.2.0",
+ "version": "2.3.0",
"dev": true
},
"entities": {
@@ -10915,7 +11289,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -10926,6 +11300,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -11064,11 +11441,8 @@
"dev": true
},
"eventsource": {
- "version": "1.1.0",
- "dev": true,
- "requires": {
- "original": "^1.0.0"
- }
+ "version": "2.0.2",
+ "dev": true
},
"exec-sh": {
"version": "0.2.2",
@@ -11109,14 +11483,14 @@
"dev": true
},
"json5": {
- "version": "1.0.1",
+ "version": "1.0.2",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
- "version": "1.4.0",
+ "version": "1.4.2",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -11127,48 +11501,48 @@
}
},
"express": {
- "version": "4.17.3",
+ "version": "4.18.2",
"dev": true,
"requires": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.19.2",
+ "body-parser": "1.20.1",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.4.2",
+ "cookie": "0.5.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
- "finalhandler": "~1.1.2",
+ "finalhandler": "1.2.0",
"fresh": "0.5.2",
+ "http-errors": "2.0.0",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.7",
- "qs": "6.9.7",
+ "qs": "6.11.0",
"range-parser": "~1.2.1",
"safe-buffer": "5.2.1",
- "send": "0.17.2",
- "serve-static": "1.14.2",
+ "send": "0.18.0",
+ "serve-static": "1.15.0",
"setprototypeof": "1.2.0",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
},
"dependencies": {
"qs": {
- "version": "6.9.7",
- "dev": true
- },
- "safe-buffer": {
- "version": "5.2.1",
- "dev": true
+ "version": "6.11.0",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
@@ -11225,7 +11599,7 @@
}
},
"fb-watchman": {
- "version": "2.0.1",
+ "version": "2.0.2",
"dev": true,
"requires": {
"bser": "2.1.1"
@@ -11251,7 +11625,7 @@
"file-saver": {
"version": "git+ssh://git@github.com/devgateway/FileSaver.js.git#20b5a235d8ca3b174b8c5f51dfdff11f9a00cccb",
"dev": true,
- "from": "file-saver@git+ssh://github.com/devgateway/FileSaver.js"
+ "from": "file-saver@github:devgateway/FileSaver.js"
},
"filename-regex": {
"version": "2.0.1"
@@ -11284,15 +11658,15 @@
}
},
"finalhandler": {
- "version": "1.1.2",
+ "version": "1.2.0",
"dev": true,
"requires": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"unpipe": "~1.0.0"
}
},
@@ -11324,7 +11698,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11335,6 +11709,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -11344,7 +11721,7 @@
}
},
"follow-redirects": {
- "version": "1.14.9",
+ "version": "1.15.3",
"dev": true
},
"for-in": {
@@ -11392,7 +11769,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11403,6 +11780,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -11413,6 +11793,8 @@
},
"fs": {
"version": "0.0.1-security",
+ "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+ "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
"dev": true
},
"fs-extra": {
@@ -11434,7 +11816,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11445,6 +11827,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -11457,12 +11842,23 @@
"version": "1.0.0"
},
"function-bind": {
- "version": "1.1.1"
+ "version": "1.1.1",
+ "dev": true
},
"gather-stream": {
"version": "1.0.0",
"dev": true
},
+ "get-intrinsic": {
+ "version": "1.2.1",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3"
+ }
+ },
"get-value": {
"version": "2.0.6",
"dev": true
@@ -11501,15 +11897,22 @@
"globals": {
"version": "9.18.0"
},
+ "gopd": {
+ "version": "1.0.1",
+ "dev": true,
+ "requires": {
+ "get-intrinsic": "^1.1.3"
+ }
+ },
"graceful-fs": {
- "version": "4.2.9"
+ "version": "4.2.11"
},
"handlebars": {
- "version": "4.7.7",
+ "version": "4.7.8",
"dev": true,
"requires": {
"minimist": "^1.2.5",
- "neo-async": "^2.6.0",
+ "neo-async": "^2.6.2",
"source-map": "^0.6.1",
"uglify-js": "^3.1.4",
"wordwrap": "^1.0.0"
@@ -11534,10 +11937,7 @@
}
},
"has": {
- "version": "1.0.3",
- "requires": {
- "function-bind": "^1.1.1"
- }
+ "version": "1.0.4"
},
"has-ansi": {
"version": "2.0.0",
@@ -11549,6 +11949,21 @@
"version": "1.0.0",
"dev": true
},
+ "has-property-descriptors": {
+ "version": "1.0.0",
+ "dev": true,
+ "requires": {
+ "get-intrinsic": "^1.1.1"
+ }
+ },
+ "has-proto": {
+ "version": "1.0.1",
+ "dev": true
+ },
+ "has-symbols": {
+ "version": "1.0.3",
+ "dev": true
+ },
"has-value": {
"version": "1.0.0",
"dev": true,
@@ -11610,6 +12025,8 @@
},
"he": {
"version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
"history": {
@@ -11657,18 +12074,18 @@
}
},
"http-errors": {
- "version": "1.8.1",
+ "version": "2.0.0",
"dev": true,
"requires": {
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"inherits": "2.0.4",
"setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
+ "statuses": "2.0.1",
"toidentifier": "1.0.1"
}
},
"http-parser-js": {
- "version": "0.5.5",
+ "version": "0.5.8",
"dev": true
},
"http-proxy": {
@@ -11731,10 +12148,14 @@
},
"image-size": {
"version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
+ "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==",
"dev": true
},
"immediate": {
"version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
"dev": true
},
"imports-loader": {
@@ -11820,7 +12241,7 @@
"version": "1.1.6"
},
"is-core-module": {
- "version": "2.8.1",
+ "version": "2.13.0",
"requires": {
"has": "^1.0.3"
}
@@ -11941,7 +12362,7 @@
},
"dependencies": {
"whatwg-fetch": {
- "version": "3.6.2"
+ "version": "3.6.19"
}
}
},
@@ -12105,20 +12526,16 @@
"version": "0.4.1"
},
"json-stable-stringify": {
- "version": "1.0.1",
+ "version": "1.0.2",
"dev": true,
"requires": {
- "jsonify": "~0.0.0"
+ "jsonify": "^0.0.1"
}
},
"json-stringify-safe": {
"version": "5.0.1",
"dev": true
},
- "json3": {
- "version": "3.3.3",
- "dev": true
- },
"json5": {
"version": "0.5.1"
},
@@ -12130,7 +12547,7 @@
}
},
"jsonify": {
- "version": "0.0.0",
+ "version": "0.0.1",
"dev": true
},
"jsprim": {
@@ -12144,17 +12561,21 @@
}
},
"jszip": {
- "version": "3.7.1",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
"dev": true,
"requires": {
"lie": "~3.3.0",
"pako": "~1.0.2",
"readable-stream": "~2.3.6",
- "set-immediate-shim": "~1.0.1"
+ "setimmediate": "^1.0.5"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -12166,8 +12587,16 @@
"util-deprecate": "~1.0.1"
}
},
+ "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
+ },
"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"
@@ -12337,6 +12766,8 @@
},
"lie": {
"version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
"dev": true,
"requires": {
"immediate": "~3.0.5"
@@ -12464,7 +12895,7 @@
}
},
"loglevel": {
- "version": "1.8.0"
+ "version": "1.8.1"
},
"longest": {
"version": "1.0.1",
@@ -12513,7 +12944,7 @@
}
},
"math-expression-evaluator": {
- "version": "1.3.14",
+ "version": "1.4.0",
"dev": true
},
"math-random": {
@@ -12532,7 +12963,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -12544,6 +12975,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
"dev": true,
@@ -12588,14 +13023,14 @@
"dev": true
},
"mime-db": {
- "version": "1.51.0",
+ "version": "1.52.0",
"dev": true
},
"mime-types": {
- "version": "2.1.34",
+ "version": "2.1.35",
"dev": true,
"requires": {
- "mime-db": "1.51.0"
+ "mime-db": "1.52.0"
}
},
"minimatch": {
@@ -12605,7 +13040,7 @@
}
},
"minimist": {
- "version": "1.2.5"
+ "version": "1.2.8"
},
"mississippi": {
"version": "2.0.0",
@@ -12640,13 +13075,13 @@
}
},
"mkdirp": {
- "version": "0.5.5",
+ "version": "0.5.6",
"requires": {
- "minimist": "^1.2.5"
+ "minimist": "^1.2.6"
}
},
"moment": {
- "version": "2.29.1",
+ "version": "2.29.4",
"dev": true
},
"move-concurrently": {
@@ -12762,7 +13197,7 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -12783,6 +13218,10 @@
}
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "0.10.31",
"dev": true
@@ -12898,6 +13337,14 @@
}
}
},
+ "object-inspect": {
+ "version": "1.12.3",
+ "dev": true
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "dev": true
+ },
"object-visit": {
"version": "1.0.1",
"dev": true,
@@ -12911,6 +13358,16 @@
}
}
},
+ "object.assign": {
+ "version": "4.1.4",
+ "dev": true,
+ "requires": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
+ "object-keys": "^1.1.1"
+ }
+ },
"object.omit": {
"version": "2.0.1",
"requires": {
@@ -12932,7 +13389,7 @@
}
},
"on-finished": {
- "version": "2.3.0",
+ "version": "2.4.1",
"dev": true,
"requires": {
"ee-first": "1.1.1"
@@ -12988,13 +13445,6 @@
}
}
},
- "original": {
- "version": "1.0.2",
- "dev": true,
- "requires": {
- "url-parse": "^1.4.3"
- }
- },
"os-browserify": {
"version": "0.2.1",
"dev": true
@@ -13022,6 +13472,8 @@
},
"pako": {
"version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
"dev": true
},
"parallel-transform": {
@@ -13033,7 +13485,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -13044,6 +13496,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -13449,7 +13904,7 @@
"version": "1.0.2"
},
"psl": {
- "version": "1.8.0",
+ "version": "1.9.0",
"dev": true
},
"pump": {
@@ -13468,7 +13923,7 @@
}
},
"punycode": {
- "version": "2.1.1"
+ "version": "2.3.0"
},
"qs": {
"version": "6.5.3",
@@ -13482,10 +13937,6 @@
"strict-uri-encode": "^1.0.0"
}
},
- "querystring": {
- "version": "0.2.0",
- "dev": true
- },
"querystring-es3": {
"version": "0.2.1",
"dev": true
@@ -13515,11 +13966,11 @@
"dev": true
},
"raw-body": {
- "version": "2.4.3",
+ "version": "2.5.1",
"dev": true,
"requires": {
"bytes": "3.1.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
},
@@ -13696,6 +14147,8 @@
},
"react-interactive": {
"version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/react-interactive/-/react-interactive-0.4.1.tgz",
+ "integrity": "sha512-IzWpnuKRZc7z3ss72+yk29bcZjxjiMz3Un4BnJw/0nlSXfm6ofQtcMTh+267siCaj9hQ24134suqoHL42z0y4g==",
"dev": true,
"requires": {
"detect-it": "^2.0.0",
@@ -13709,7 +14162,7 @@
"version": "3.0.4"
},
"react-modal": {
- "version": "3.14.4",
+ "version": "3.16.1",
"requires": {
"exenv": "^1.2.0",
"prop-types": "^15.7.2",
@@ -13799,6 +14252,18 @@
"warning": "^3.0.0"
}
},
+ "react-router-hash-link": {
+ "version": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
+ "dev": true,
+ "from": "react-router-hash-link@git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3",
+ "requires": {
+ "object-assign": "^4.1.0",
+ "react": "^15.4.1",
+ "react-dom": "^15.4.1",
+ "react-interactive": "^0.4.0",
+ "react-router": "^3.0.0"
+ }
+ },
"react-router-redux": {
"version": "4.0.8",
"dev": true
@@ -13861,7 +14326,7 @@
}
},
"readable-stream": {
- "version": "3.6.0",
+ "version": "3.6.2",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -14078,7 +14543,7 @@
}
},
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -14090,6 +14555,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
"dev": true,
@@ -14252,10 +14721,13 @@
"version": "1.0.0",
"dev": true
},
+ "reselect": {
+ "version": "4.1.8"
+ },
"resolve": {
- "version": "1.22.0",
+ "version": "1.22.6",
"requires": {
- "is-core-module": "^2.8.1",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
}
@@ -14282,12 +14754,12 @@
},
"dependencies": {
"glob": {
- "version": "7.2.0",
+ "version": "7.2.3",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
@@ -14305,7 +14777,7 @@
}
},
"safe-buffer": {
- "version": "5.1.2"
+ "version": "5.2.1"
},
"safe-regex": {
"version": "1.1.0",
@@ -14331,7 +14803,9 @@
}
},
"sax": {
- "version": "1.2.4",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
"dev": true
},
"schema-utils": {
@@ -14342,25 +14816,25 @@
}
},
"semver": {
- "version": "5.7.1"
+ "version": "5.7.2"
},
"send": {
- "version": "0.17.2",
+ "version": "0.18.0",
"dev": true,
"requires": {
"debug": "2.6.9",
- "depd": "~1.1.2",
- "destroy": "~1.0.4",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"mime": "1.6.0",
"ms": "2.1.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"range-parser": "~1.2.1",
- "statuses": "~1.5.0"
+ "statuses": "2.0.1"
},
"dependencies": {
"ms": {
@@ -14385,6 +14859,10 @@
"parseurl": "~1.3.2"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "dev": true
+ },
"http-errors": {
"version": "1.6.3",
"dev": true,
@@ -14402,23 +14880,23 @@
"setprototypeof": {
"version": "1.1.0",
"dev": true
+ },
+ "statuses": {
+ "version": "1.5.0",
+ "dev": true
}
}
},
"serve-static": {
- "version": "1.14.2",
+ "version": "1.15.0",
"dev": true,
"requires": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.3",
- "send": "0.17.2"
+ "send": "0.18.0"
}
},
- "set-immediate-shim": {
- "version": "1.0.1",
- "dev": true
- },
"set-value": {
"version": "2.0.1",
"dev": true,
@@ -14452,6 +14930,15 @@
"shallowequal": {
"version": "1.1.0"
},
+ "side-channel": {
+ "version": "1.0.4",
+ "dev": true,
+ "requires": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ }
+ },
"slash": {
"version": "1.0.0"
},
@@ -14567,15 +15054,14 @@
}
},
"sockjs-client": {
- "version": "1.5.2",
+ "version": "1.6.1",
"dev": true,
"requires": {
- "debug": "^3.2.6",
- "eventsource": "^1.0.7",
- "faye-websocket": "^0.11.3",
+ "debug": "^3.2.7",
+ "eventsource": "^2.0.2",
+ "faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
- "json3": "^3.3.3",
- "url-parse": "^1.5.3"
+ "url-parse": "^1.5.10"
},
"dependencies": {
"debug": {
@@ -14605,6 +15091,59 @@
"source-map": {
"version": "0.5.7"
},
+ "source-map-loader": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+ "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+ "dev": true,
+ "requires": {
+ "async": "^2.5.0",
+ "loader-utils": "^1.1.0"
+ },
+ "dependencies": {
+ "async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true
+ },
+ "emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+ "dev": true
+ },
+ "json5": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.0"
+ }
+ },
+ "loader-utils": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+ "dev": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^1.0.1"
+ }
+ }
+ }
+ },
"source-map-resolve": {
"version": "0.5.3",
"dev": true,
@@ -14627,7 +15166,7 @@
"dev": true
},
"spdx-correct": {
- "version": "3.1.1",
+ "version": "3.2.0",
"requires": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -14644,7 +15183,7 @@
}
},
"spdx-license-ids": {
- "version": "3.0.11"
+ "version": "3.0.16"
},
"split-string": {
"version": "3.1.0",
@@ -14725,7 +15264,7 @@
}
},
"statuses": {
- "version": "1.5.0",
+ "version": "2.0.1",
"dev": true
},
"stream-browserify": {
@@ -14737,7 +15276,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -14749,6 +15288,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
"dev": true,
@@ -14781,7 +15324,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -14793,6 +15336,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
"dev": true,
@@ -14814,12 +15361,6 @@
"dev": true,
"requires": {
"safe-buffer": "~5.2.0"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.2.1",
- "dev": true
- }
}
},
"stringstream": {
@@ -14886,7 +15427,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -14897,6 +15438,9 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
"requires": {
@@ -15014,7 +15558,7 @@
"version": "0.0.6"
},
"ua-parser-js": {
- "version": "0.7.31"
+ "version": "0.7.36"
},
"uglify-es": {
"version": "3.3.9",
@@ -15029,7 +15573,7 @@
}
},
"uglify-js": {
- "version": "3.15.1",
+ "version": "3.17.4",
"dev": true,
"optional": true
},
@@ -15175,21 +15719,28 @@
"dev": true
},
"url": {
- "version": "0.11.0",
+ "version": "0.11.3",
"dev": true,
"requires": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "punycode": "^1.4.1",
+ "qs": "^6.11.2"
},
"dependencies": {
"punycode": {
- "version": "1.3.2",
+ "version": "1.4.1",
"dev": true
+ },
+ "qs": {
+ "version": "6.11.2",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
"url-parse": {
- "version": "1.5.9",
+ "version": "1.5.10",
"dev": true,
"requires": {
"querystringify": "^2.1.1",
@@ -15370,7 +15921,7 @@
}
},
"readable-stream": {
- "version": "2.3.7",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -15382,6 +15933,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
"dev": true,
@@ -15488,10 +16043,14 @@
},
"xml": {
"version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
"dev": true
},
"xml-js": {
"version": "1.6.11",
+ "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+ "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
"dev": true,
"requires": {
"sax": "^1.2.4"
diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json
index 2e45456f663..02f32d0af10 100644
--- a/amp/TEMPLATE/reamp/package.json
+++ b/amp/TEMPLATE/reamp/package.json
@@ -23,15 +23,15 @@
"author": "Alexei Savca",
"license": "inherit",
"devDependencies": {
- "amp-ui": "git+ssh://github.com/devgateway/amp-ui#v2.1.0",
+ "amp-ui": "github:devgateway/amp-ui#develop",
"babel-core": "^6.26.3",
"babel-jest": "^6.0.1",
"babel-loader": "^6.3.2",
+ "babel-plugin-typecheck": "^1.2.0",
+ "babel-polyfill": "^6.16.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0",
- "babel-polyfill": "^6.16.0",
- "babel-plugin-typecheck": "^1.2.0",
"bootstrap": "^3.3.5",
"classnames": "^2.1.3",
"css-loader": "^0.15.6",
@@ -60,6 +60,7 @@
"redux": "^3.6.0",
"redux-logger": "^2.7.4",
"redux-thunk": "2.2.0",
+ "source-map-loader": "^0.2.4",
"style-loader": "^0.12.3",
"webpack": "^1.13.3",
"webpack-dev-server": "^1.10.1",
@@ -75,6 +76,7 @@
"react-modal": "^3.3.1",
"react-number-input": "^15.0.0-rc2",
"react-select": "^1.0.0-rc.3",
+ "reselect": "^4.1.7",
"uglifyjs-webpack-plugin": "^1.3.0"
}
}
diff --git a/amp/TEMPLATE/reamp/webpack.dev.config.js b/amp/TEMPLATE/reamp/webpack.dev.config.js
index af18beb5c8a..37ea916f105 100644
--- a/amp/TEMPLATE/reamp/webpack.dev.config.js
+++ b/amp/TEMPLATE/reamp/webpack.dev.config.js
@@ -81,12 +81,19 @@ module.exports = {
{test: /\.json$/, loader: 'json'},
{test: /\.css$/, exclude: /\.useable\.css$/, loader: "style!css"},
- {test: /\.less$/, loader: "style!css!less"}
+ {test: /\.less$/, loader: "style!css!less"},
+ {
+ enforce: 'pre',
+ test: /\.js$/,
+ loader: 'source-map-loader',
+ exclude: /node_modules/
+ }
]
},
- devtool: 'source-map-inline',
-
+ debug: true,
+ devtool: 'inline-source-map',
resolve: {
+ symlinks: false,
extensions: ['', '.js', '.es6', '.jsx'],
alias: {
'react': path.join(__dirname, 'node_modules', 'react'),
diff --git a/amp/WEB-INF/src/ehcache.xml b/amp/WEB-INF/src/ehcache.xml
index 0bc04209912..854878cea49 100644
--- a/amp/WEB-INF/src/ehcache.xml
+++ b/amp/WEB-INF/src/ehcache.xml
@@ -111,7 +111,7 @@
/>
getIdsComputedWorkspaceQuery(AmpTeam team) {
}
// remove draft activities at end since filters don't not know of this condition
- if (team.getHideDraftActivities()) {
+ if (team.getHideDraftActivities() != null && team.getHideDraftActivities()) {
String draftActsSql = "SELECT amp_activity_id FROM amp_activity WHERE draft = TRUE";
Set draftActivities = ActivityUtil.fetchLongs(draftActsSql);
ids.removeAll(draftActivities);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/nireports/amp/AmpReportsSchema.java b/amp/WEB-INF/src/org/dgfoundation/amp/nireports/amp/AmpReportsSchema.java
index b32458f1e72..3cea6f012d6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/nireports/amp/AmpReportsSchema.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/nireports/amp/AmpReportsSchema.java
@@ -600,6 +600,8 @@ protected AmpReportsSchema() {
single_dimension(ColumnConstants.PRIMARY_SECTOR_CODE_OFFICIAL, "v_sector_code_official", PS_DIM_USG
.getLevelColumn(LEVEL_ROOT));
+ single_dimension(ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_CODE, "v_nationalobjectives_code", PS_DIM_USG
+ .getLevelColumn(LEVEL_ROOT));
with_percentage(ColumnConstants.PRIMARY_SECTOR, "v_sectors", PS_DIM_USG, LEVEL_ROOT);
with_percentage(ColumnConstants.PRIMARY_SECTOR_SUB_SECTOR, "v_sub_sectors", PS_DIM_USG, LEVEL_SUBSECTOR);
with_percentage(ColumnConstants.PRIMARY_SECTOR_SUB_SUB_SECTOR, "v_sub_sub_sectors", PS_DIM_USG, LEVEL_SUBSUBSECTOR);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/tables/AmpResourcesFormTableFeature.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/tables/AmpResourcesFormTableFeature.java
index 6147def7da3..f4116e0f55a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/tables/AmpResourcesFormTableFeature.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/tables/AmpResourcesFormTableFeature.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2011 Development Gateway (www.developmentgateway.org)
- *
*/
package org.dgfoundation.amp.onepager.components.features.tables;
@@ -56,8 +55,8 @@
public class AmpResourcesFormTableFeature extends AmpFormTableFeaturePanel {
boolean refreshExistingDocs = false;
-
-
+
+
/**
* @param id
* @param fmName
@@ -65,25 +64,24 @@ public class AmpResourcesFormTableFeature extends AmpFormTableFeaturePanel am) throws Exception {
+ final IModel am) throws Exception {
super(id, am, fmName);
super.setTitleHeaderColSpan(10);
-
- final IModel> setModel=new PropertyModel>(am,"activityDocuments");
+ final IModel> setModel = new PropertyModel>(am, "activityDocuments");
if (am.getObject().getActivityDocuments() == null)
am.getObject().setActivityDocuments(new HashSet());
-
- IModel> listModel = new AbstractReadOnlyModel>() {
+
+ IModel> listModel = new AbstractReadOnlyModel>() {
private transient List existingTmpDocs = getExistingObject();
-
+
private List getExistingObject() {
Iterator it = setModel.getObject().iterator();
List ret = new ArrayList();
- HashSet existingDocTitles = new HashSet();
+ HashSet existingDocTitles = new HashSet();
while (it.hasNext()) {
AmpActivityDocument d = (AmpActivityDocument) it.next();
@@ -112,7 +110,7 @@ private List getExistingObject() {
td.setContentType(nw.getContentType());
ret.add(td);
-
+
// Existing doc titles should be populated only when multilingual is enabled
if (ContentTranslationUtil.multilingualIsEnabled()) {
TemporaryActivityDocument titleHolder = new TemporaryActivityDocument();
@@ -122,7 +120,7 @@ private List getExistingObject() {
existingDocTitles.add(td);
}
}
-
+
getSession().setMetaData(OnePagerConst.RESOURCES_EXISTING_ITEM_TITLES, existingDocTitles);
refreshExistingDocs = false;
return ret;
@@ -131,14 +129,14 @@ private List getExistingObject() {
@Override
public List getObject() {
HashSet newItems = getSession().getMetaData(OnePagerConst.RESOURCES_NEW_ITEMS);
- if(newItems == null)
+ if (newItems == null)
newItems = new HashSet();
HashSet delItems = getSession().getMetaData(OnePagerConst.RESOURCES_DELETED_ITEMS);
- if(delItems == null)
+ if (delItems == null)
delItems = new HashSet();
List ret = new ArrayList();
-
- if(refreshExistingDocs)
+
+ if (refreshExistingDocs)
existingTmpDocs = getExistingObject();
ret.addAll(existingTmpDocs);
@@ -165,73 +163,71 @@ public List getObject() {
}
};
-
+
list = new ListView("list", listModel) {
private static final long serialVersionUID = 7218457979728871528L;
-
+
@Override
protected void onAfterRender() {
super.onAfterRender();
DocumentManagerUtil.logoutJcrSessions(SessionUtil.getCurrentServletRequest());
}
-
+
@Override
protected void populateItem(final ListItem item) {
- if (item.getModel() == null && item.getModelObject() == null){
+ if (item.getModel() == null && item.getModelObject() == null) {
logger.error("ola");
return;
}
-
- TemporaryDocument document = (TemporaryDocument)item.getModelObject();
- if (!ContentTranslationUtil.multilingualIsEnabled()){
- item.add(new Label("title",item.getModel().getObject().getTitle()));
- }
- else {
+ TemporaryDocument document = (TemporaryDocument) item.getModelObject();
+
+ if (!ContentTranslationUtil.multilingualIsEnabled()) {
+ item.add(new Label("title", item.getModel().getObject().getTitle()));
+ } else {
String id;
if (document.getExistingDocument() != null) {
id = document.getExistingDocument().getUuid();
+ } else {
+ id = document.getNewTemporaryDocumentId();
}
-
- else {
- id = document.getNewTemporaryDocumentId();
- }
- Model newResourceIdModel = new Model (id);
- final ResourceTranslationModel titleModel = new ResourceTranslationModel(new PropertyModel(item.getModel().getObject(), "title"),newResourceIdModel);
- final AmpTextFieldPanel name = new AmpTextFieldPanel("title",titleModel , "Title",AmpFMTypes.MODULE,Boolean.TRUE);
+ Model newResourceIdModel = new Model(id);
+ final ResourceTranslationModel titleModel = new ResourceTranslationModel(new PropertyModel(item.getModel().getObject(), "title"), newResourceIdModel);
+ final AmpTextFieldPanel name = new AmpTextFieldPanel("title", titleModel, "Title", AmpFMTypes.MODULE, Boolean.TRUE);
name.setEnabled(false);
name.getTextContainer().setRequired(true);
- item.add (name);
-
-
+ item.add(name);
+
+
}
- if (item.getModel().getObject().getFileName()==null){
- item.add(new Label("resourceName",item.getModel().getObject().getWebLink()));
- }else{
- item.add(new Label("resourceName",item.getModel().getObject().getFileName()));
+ if (item.getModel().getObject().getFileName() == null) {
+ item.add(new Label("resourceName", item.getModel().getObject().getWebLink()));
+ } else {
+ item.add(new Label("resourceName", item.getModel().getObject().getFileName()));
}
-
+
PropertyModel dateModel = new PropertyModel(item.getModel(), "date.time");
String pattern = FeaturesUtil.getGlobalSettingValue(Constants.GLOBALSETTINGS_DATEFORMAT);
pattern = pattern.replace('m', 'M');
SimpleDateFormat formater = new SimpleDateFormat(pattern);
String formatedDate = formater.format(dateModel.getObject());
-
+
item.add(new AmpLabelFieldPanel("date", new Model(formatedDate), "Document Date", true));
item.add(new AmpLabelFieldPanel("year", new PropertyModel(item.getModel(), "year"), "Document Year", true));
item.add(new AmpLabelFieldPanel("size", new PropertyModel(item.getModel(), "fileSize"), "Document Size", true));
item.add(new AmpLabelFieldPanel("docType", new PropertyModel(item.getModel(), "type.label"), "Document Type", true));
-
+
final DownloadResourceStream drs;
if (item.getModelObject().isExisting())
- drs = new DownloadResourceStream(new PersistentObjectModel(item.getModelObject().getExistingDocument()));
+ drs = new DownloadResourceStream(new PersistentObjectModel<>
+ (item.getModelObject().getExistingDocument()), item.getModelObject().getFileName());
else
- drs = new DownloadResourceStream(item.getModelObject().getFile());
-
+ drs = new DownloadResourceStream(item.getModelObject().getFile(), item.getModelObject().getFileName());
+
String webLink = item.getModelObject().getWebLink();
-
- if (webLink!=null && webLink.length()>0 ){
+
+ if (webLink != null && webLink.length() > 0) {
if (!webLink.startsWith("http"))
webLink = "http://" + webLink;
ExternalLink link = new ExternalLink("download", new Model(webLink));
@@ -239,19 +235,18 @@ protected void populateItem(final ListItem item) {
WebMarkupContainer downloadLinkImg = new WebMarkupContainer("downloadImage");
downloadLinkImg.add(new AttributeModifier("src", new Model("/TEMPLATE/ampTemplate/img_2/ico_attachment.png")));
link.add(downloadLinkImg);
- }
- else{
+ } else {
Link downloadLink = new Link("download") {
@Override
public void onClick() {
getRequestCycle().scheduleRequestHandlerAfterCurrent(new ResourceStreamRequestHandler(drs, drs.getFileName()));
}
- };
+ };
item.add(downloadLink);
-
+
String contentType = item.getModelObject().getFileName();
int index = contentType.lastIndexOf('.');
-
+
String extension = contentType.substring(index + 1, contentType.length());
String extPath = "/TEMPLATE/ampTemplate/images/icons/" + extension + ".gif";
File extImgFile = new File(WebApplication.get().getServletContext().getRealPath(extPath));
@@ -259,24 +254,23 @@ public void onClick() {
extPath = "/TEMPLATE/ampTemplate/images/icons/default.icon.gif";
else
extPath = "/TEMPLATE/ampTemplate/images/icons/" + extension + ".gif";
-
+
WebMarkupContainer downloadLinkImg = new WebMarkupContainer("downloadImage");
downloadLinkImg.add(new AttributeModifier("src", new Model(extPath)));
downloadLink.add(downloadLinkImg);
}
-
+
AmpDeleteLinkField delRelOrg = new AmpDeleteLinkField("delete", "Delete Resource") {
@Override
public void onClick(AjaxRequestTarget target) {
- if (item.getModelObject().isExisting()){
+ if (item.getModelObject().isExisting()) {
HashSet delItems = getSession().getMetaData(OnePagerConst.RESOURCES_DELETED_ITEMS);
- if (delItems == null){
+ if (delItems == null) {
delItems = new HashSet();
getSession().setMetaData(OnePagerConst.RESOURCES_DELETED_ITEMS, delItems);
}
delItems.add(item.getModelObject().getExistingDocument());
- }
- else{
+ } else {
HashSet newItems = getSession().getMetaData(OnePagerConst.RESOURCES_NEW_ITEMS);
newItems.remove(item.getModelObject());
}
@@ -286,12 +280,12 @@ public void onClick(AjaxRequestTarget target) {
item.add(delRelOrg);
}
};
-
+
add(list);
}
-
-
+
+
public void setRefreshExistingDocs(boolean refreshExistingDocs) {
this.refreshExistingDocs = refreshExistingDocs;
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/helper/DownloadResourceStream.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/helper/DownloadResourceStream.java
index aeb8aff52fc..530078cb181 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/helper/DownloadResourceStream.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/helper/DownloadResourceStream.java
@@ -6,6 +6,7 @@
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.model.IModel;
@@ -23,7 +24,7 @@
public class DownloadResourceStream implements IResourceStream {
private static final Logger logger = Logger.getLogger(DownloadResourceStream.class);
-
+
private String contentType;
private transient Locale locale;
private FileUpload file;
@@ -32,21 +33,33 @@ public class DownloadResourceStream implement
private String fileName;
private transient InputStream fileData;
private Bytes fileSize;
-
+
+ public DownloadResourceStream(FileUpload f, String fileName) {
+ this(f);
+ this.fileName = fileName;
+ }
+
public DownloadResourceStream(FileUpload f) {
this.file = f;
this.newResource = true;
}
-
+
public DownloadResourceStream(IModel doc) {
this.doc = doc;
this.newResource = false;
}
-
- private synchronized void initHelperFields(){
+
+ public DownloadResourceStream(IModel doc, String fileName) {
+ this(doc);
+ this.fileName = fileName;
+
+ }
+
+
+ private synchronized void initHelperFields() {
//Singleton
- if (true || contentType == null){
- if (newResource){
+ if (true || contentType == null) {
+ if (newResource) {
contentType = file.getContentType();
fileSize = Bytes.bytes(file.getSize());
fileName = file.getClientFileName();
@@ -55,18 +68,17 @@ private synchronized void initHelperFields(){
} catch (IOException e) {
logger.error(e.getMessage(), e);
}
- }
- else{
- AmpAuthWebSession s = (AmpAuthWebSession) org.apache.wicket.Session.get();
+ } else {
+ AmpAuthWebSession s = (AmpAuthWebSession) org.apache.wicket.Session.get();
Node node = DocumentManagerUtil.getWriteNode(doc.getObject().getUuid(), SessionUtil.getCurrentServletRequest());
NodeWrapper nw = new NodeWrapper(node);
-
+
contentType = nw.getContentType();
fileName = nw.getName();
try {
Property data = nw.getNode().getProperty(CrConstants.PROPERTY_DATA);
fileData = data.getStream();
-
+
Property size = nw.getNode().getProperty(CrConstants.PROPERTY_FILE_SIZE);
fileSize = Bytes.bytes(size.getLong());
DocumentManagerUtil.logoutJcrSessions(SessionUtil.getCurrentServletRequest());
@@ -76,7 +88,7 @@ private synchronized void initHelperFields(){
}
}
}
-
+
@Override
public Time lastModifiedTime() {
return null;
@@ -131,7 +143,7 @@ public String getStyle() {
@Override
public void setStyle(String style) {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -143,8 +155,8 @@ public String getVariation() {
@Override
public void setVariation(String variation) {
// TODO Auto-generated method stub
-
+
}
-
+
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java
index 01e021a2d9d..bd5b999b3f9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/util/ActivityUtil.java
@@ -170,8 +170,10 @@ public static AmpActivityVersion saveActivity(AmpActivityVersion oldA, Collectio
boolean newActivity = oldA.getAmpActivityId() == null;
AmpActivityVersion a = null;
+ List cumulativeValues = new ArrayList<>();
try {
- a = saveActivityNewVersion(oldA, values, ampCurrentMember, draft, session, saveContext, editorStore, site);
+ a = saveActivityNewVersion(oldA, values, cumulativeValues, ampCurrentMember, draft, session, saveContext,
+ editorStore, site);
} catch (Exception exception) {
logger.error("Error saving activity:", exception); // Log the exception
throw new RuntimeException("Can't save activity:", exception);
@@ -181,8 +183,7 @@ public static AmpActivityVersion saveActivity(AmpActivityVersion oldA, Collectio
new ActivityValidationWorkflowTrigger(a);
}
- List translations = values == null ? new ArrayList<>() : new ArrayList<>(values);
- LuceneUtil.addUpdateActivity(rootRealPath, !newActivity, site, locale, a, oldA, translations);
+ LuceneUtil.addUpdateActivity(rootRealPath, !newActivity, site, locale, a, oldA, cumulativeValues);
return a;
}
@@ -203,12 +204,13 @@ public static void prepareToSave(AmpActivityVersion a, AmpActivityVersion oldA,
}
public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
- Collection translations, AmpTeamMember ampCurrentMember, boolean draft,
+ Collection translations, List cumulativeTranslations,
+ AmpTeamMember ampCurrentMember, boolean draft,
Session session, SaveContext context, EditorStore editorStore, Site site) throws Exception {
boolean draftChange = detectDraftChange(a, draft);
- return saveActivityNewVersion(a, translations, ampCurrentMember, draft, draftChange, session, context,
- editorStore, site);
+ return saveActivityNewVersion(a, translations, cumulativeTranslations, ampCurrentMember, draft,
+ draftChange, session, context, editorStore, site);
}
/**
@@ -216,7 +218,8 @@ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
* returns newActivity
*/
public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
- Collection translations, AmpTeamMember ampCurrentMember, boolean draft,
+ Collection translations, List cumulativeTranslations,
+ AmpTeamMember ampCurrentMember, boolean draft,
boolean draftChange, Session session, SaveContext context,
EditorStore editorStore, Site site) throws Exception {
@@ -236,7 +239,7 @@ public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
}
if (ContentTranslationUtil.multilingualIsEnabled())
- ContentTranslationUtil.cloneTranslations(a, translations);
+ ContentTranslationUtil.cloneTranslations(a, translations, cumulativeTranslations);
//is versioning activated?
boolean createNewVersion = (draft == draftChange) && ActivityVersionUtil.isVersioningEnabled();
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/visibility/data/ColumnsVisibility.java b/amp/WEB-INF/src/org/dgfoundation/amp/visibility/data/ColumnsVisibility.java
index 7ccb1568f5c..8e6a9310ee8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/visibility/data/ColumnsVisibility.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/visibility/data/ColumnsVisibility.java
@@ -402,6 +402,7 @@ protected Map> getDependancyMapTypeAll() {
put("Pledge Status", ColumnConstants.PLEDGE_STATUS);
put("Pledges Titles", ColumnConstants.PLEDGES_TITLES);
put("Primary Sector Code Official", ColumnConstants.PRIMARY_SECTOR_CODE_OFFICIAL);
+ put("National Planning Objectives Code", ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_CODE);
put("Project Age Ratio", ColumnConstants.PROJECT_AGE_RATIO);
put("Project Implementation Delay", ColumnConstants.PROJECT_IMPLEMENTATION_DELAY);
put("Project Description", ColumnConstants.PROJECT_DESCRIPTION);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java
index ef559958fb9..13ad997c83e 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/AMPActivityService.java
@@ -79,11 +79,12 @@ public AmpActivityVersion getActivity(Long activityId) throws DgException {
@Override
public AmpActivityVersion saveActivity(AmpActivityVersion newActivity, List translations,
- AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext,
- EditorStore editorStore, Site site) throws Exception {
+ List cumulativeTranslations,
+ AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext,
+ EditorStore editorStore, Site site) throws Exception {
Session session = PersistenceManager.getSession();
- return saveActivityNewVersion(newActivity, translations, modifiedBy,
+ return saveActivityNewVersion(newActivity, translations, cumulativeTranslations, modifiedBy,
Boolean.TRUE.equals(newActivity.getDraft()), draftChange,
session, saveContext, editorStore, site);
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java
index 941fc4e155e..c269d6cb0d4 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityImporter.java
@@ -4,6 +4,7 @@
import static org.digijava.kernel.ampapi.endpoints.activity.SaveMode.SUBMIT;
import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -296,10 +297,11 @@ private void importOrUpdateActivity(Long activityId) {
prepareToSave();
boolean draftChange = ActivityUtil.detectDraftChange(newActivity, oldActivityDraft);
- newActivity = activityService.saveActivity(newActivity, getTranslations(), modifiedBy, draftChange,
- saveContext, getEditorStore(), getSite());
+ List cumulativeTranslations = new ArrayList<>();
+ newActivity = activityService.saveActivity(newActivity, getTranslations(), cumulativeTranslations,
+ modifiedBy, draftChange, saveContext, getEditorStore(), getSite());
- activityService.updateLuceneIndex(newActivity, oldActivity, update, trnSettings, getTranslations(),
+ activityService.updateLuceneIndex(newActivity, oldActivity, update, trnSettings, cumulativeTranslations,
getSite());
}
} catch (Exception e) {
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java
index 908d86af50e..43a24fdc5c6 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityInterchangeUtils.java
@@ -16,13 +16,18 @@
import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorResponseService;
import org.digijava.kernel.ampapi.endpoints.errors.ApiRuntimeException;
import org.digijava.kernel.ampapi.endpoints.errors.GenericErrors;
+import org.digijava.kernel.ampapi.endpoints.security.SecurityService;
+import org.digijava.kernel.ampapi.endpoints.security.dto.UserSessionInformation;
+import org.digijava.kernel.ampapi.filters.AmpClientModeHolder;
import org.digijava.kernel.exception.DgException;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.services.AmpFieldsEnumerator;
import org.digijava.kernel.user.User;
+import org.digijava.kernel.util.UserUtils;
import org.digijava.module.aim.dbentity.AmpActivityVersion;
import org.digijava.module.aim.dbentity.AmpAnnualProjectBudget;
+import org.digijava.module.aim.dbentity.AmpOrgRole;
import org.digijava.module.aim.dbentity.AmpTeamMember;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.CurrencyWorker;
@@ -30,6 +35,7 @@
import org.digijava.module.aim.helper.Workspace;
import org.digijava.module.aim.util.ActivityUtil;
import org.digijava.module.aim.util.ActivityVersionUtil;
+import org.digijava.module.aim.util.DbUtil;
import org.digijava.module.aim.util.DecimalWraper;
import org.digijava.module.aim.util.FeaturesUtil;
import org.digijava.module.aim.util.TeamMemberUtil;
@@ -47,6 +53,10 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.digijava.kernel.ampapi.endpoints.common.EPConstants.ACTIVITY_DOCUMENTS;
+import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENTS;
/**
* @author Octavian Ciubotaru
@@ -72,17 +82,16 @@ private ActivityInterchangeUtils() {
*/
public static JsonApiResponse importActivity(Map newJson, boolean update,
ActivityImportRules rules, String endpointContextPath) {
-
+
// Load the enumerator for the FM template associated to the activity's workspace (AMPOFFLINE-1562)
- APIField activityField = null;
- Workspace team = TeamUtil.getWorkspace(Long.parseLong(newJson.get("team").toString()));
- Long fmId = team.getFmTemplate() != null ? team.getFmTemplate().getId() : null;
+ APIField activityField;
+ Long fmId = getFMTemplateId(newJson);
if (fmId != null) {
activityField = AmpFieldsEnumerator.getEnumerator(fmId).getActivityField();
} else {
activityField = AmpFieldsEnumerator.getEnumerator().getActivityField();
}
-
+
StringBuffer sourceURL = TLSUtils.getRequest().getRequestURL();
return new ActivityImporter(activityField, rules)
@@ -90,6 +99,14 @@ public static JsonApiResponse importActivity(Map newJson) {
+ if (AmpClientModeHolder.isOfflineClient()) {
+ Workspace team = TeamUtil.getWorkspace(Long.parseLong(newJson.get("team").toString()));
+ return team.getFmTemplate() != null ? team.getFmTemplate().getId() : null;
+ }
+ return null;
+ }
+
/**
* Validates fields filter
* @param filterJson
@@ -273,12 +290,12 @@ private static void reportActivitiesNotFound(Set ampIds,
}
}
- public static Map getActivityByAmpId(String ampId) {
+ public static Map getActivityByAmpId(String ampId, boolean isOffLineClientCall) {
Long activityId = ActivityUtil.findActivityIdByAmpId(ampId);
if (activityId == null) {
ApiErrorResponseService.reportResourceNotFound(ActivityErrors.ACTIVITY_NOT_FOUND.withDetails(ampId));
}
- return getActivity(activityId);
+ return getActivity(activityId, isOffLineClientCall);
}
/**
@@ -287,8 +304,45 @@ public static Map getActivityByAmpId(String ampId) {
* @param projectId is amp_activity_id
* @return
*/
- public static Map getActivity(Long projectId) {
- return getActivity(projectId, null);
+ public static Map getActivity(Long projectId, boolean isOfflineClientCall) {
+ Map activity = getActivity(projectId, null);
+ if (!isOfflineClientCall
+ && FeaturesUtil.isVisibleModule("/REPORTING/Activity Preview/Hide Documents if no donor")) {
+ filterPropertyBasedOnUserPermission(activity, projectId);
+ }
+ return activity;
+ }
+
+ private static void filterPropertyBasedOnUserPermission(Map activity, Long projectId) {
+ final Long donorRole = DbUtil.getAmpRole(Constants.FUNDING_AGENCY).getAmpRoleId();
+ UserSessionInformation userInformation = SecurityService.getInstance().getUserSessionInformation();
+ if (userInformation != null) {
+ User user = UserUtils.getUser(userInformation.getUserId());
+ if (user != null) {
+ if (user.getAssignedOrgs() != null && !user.getAssignedOrgs().isEmpty()) {
+ if (!userBelongToExemptOrgForDocumentVisualization(user)) {
+ List organizationIds = user.getAssignedOrgs().stream()
+ .map(ampOrganisation -> ampOrganisation.getAmpOrgId()).collect(Collectors.toList());
+ List ampOrgRoles =
+ ActivityUtil.getAmpRolesForActivityAndOrganizationsAndRole(projectId,
+ organizationIds, donorRole);
+ if (ampOrgRoles == null || ampOrgRoles.size() == 0) {
+ activity.replace(ACTIVITY_DOCUMENTS, null);
+ }
+ }
+ } else {
+ activity.remove(ACTIVITY_DOCUMENTS);
+ }
+ }
+ }
+ }
+
+ private static boolean userBelongToExemptOrgForDocumentVisualization(User user) {
+ return user.getAssignedOrgs().stream()
+ .filter(ampOrganisation
+ -> ampOrganisation.getIdentifier().equals(
+ FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENTS)))
+ .count() > 0;
}
public static AmpActivityVersion loadActivity(Long actId) {
@@ -297,7 +351,7 @@ public static AmpActivityVersion loadActivity(Long actId) {
ApiErrorResponseService.reportResourceNotFound(
ActivityErrors.ACTIVITY_NOT_FOUND.withDetails(actId.toString()));
}
-
+
return ActivityUtil.loadActivity(actId);
} catch (DgException e) {
throw new RuntimeException(e);
@@ -316,6 +370,7 @@ public static Map getActivity(Long projectId, Map getActivity(AmpActivityVersion activity, Map activityMap = exporter.export(activity, fmId);
+ return activityMap;
} catch (Exception e) {
logger.error("Error in loading activity. " + e.getMessage());
throw new RuntimeException(e);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java
index 8d7cb40ef8a..4ac7014fde3 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/ActivityService.java
@@ -21,8 +21,9 @@ public interface ActivityService {
AmpActivityVersion getActivity(Long activityId) throws DgException;
AmpActivityVersion saveActivity(AmpActivityVersion newActivity, List translations,
- AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext,
- EditorStore editorStore, Site site) throws Exception;
+ List cumulativeTranslations,
+ AmpTeamMember modifiedBy, boolean draftChange, SaveContext saveContext,
+ EditorStore editorStore, Site site) throws Exception;
void updateLuceneIndex(AmpActivityVersion newActivity, AmpActivityVersion oldActivity, boolean update,
TranslationSettings trnSettings, List translations, Site site);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java
index 8bc3d0e4f20..278891c9806 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/InterchangeEndpoints.java
@@ -31,6 +31,7 @@
import org.digijava.kernel.ampapi.endpoints.errors.ApiRuntimeException;
import org.digijava.kernel.ampapi.endpoints.security.AuthRule;
import org.digijava.kernel.ampapi.endpoints.util.ApiMethod;
+import org.digijava.kernel.ampapi.filters.AmpClientModeHolder;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.services.AmpFieldsEnumerator;
import org.digijava.module.aim.helper.Constants;
@@ -300,7 +301,8 @@ public Collection getProjects(
@ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK, response = SwaggerActivity.class,
message = "activity with full set of configured fields and their values"))
public SwaggerActivity getProject(@ApiParam("project id") @PathParam("projectId") Long projectId) {
- Map activity = ActivityInterchangeUtils.getActivity(projectId);
+ Map activity = ActivityInterchangeUtils.getActivity(projectId,
+ AmpClientModeHolder.isOfflineClient());
return new SwaggerActivity(activity);
}
@@ -335,7 +337,8 @@ public Response getProjectInfo(@PathParam("projectId") Long projectId) {
@ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK, response = SwaggerActivity.class,
message = "activity with full set of configured fields and their values"))
public SwaggerActivity getProjectByAmpId(@ApiParam("AMP Id") @QueryParam("amp-id") String ampId) {
- Map activity = ActivityInterchangeUtils.getActivityByAmpId(ampId);
+ Map activity = ActivityInterchangeUtils.getActivityByAmpId(ampId,
+ AmpClientModeHolder.isOfflineClient());
return new SwaggerActivity(activity);
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java
index 2fe9e4efef6..605529db9fb 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/activity/preview/PreviewActivityService.java
@@ -173,13 +173,13 @@ private List calculateTotals(List previewFu
Optional>> allTransactionsByTypeAndAdjustment =
previewFundings.stream().map(PreviewFunding::getTransactions).
collect(Collectors.toList()).stream().reduce((firstMap, secondMap)
- -> Stream.concat(firstMap.entrySet().stream(), secondMap.entrySet().stream())
- .collect(Collectors.toMap(Entry::getKey, Entry::getValue,
- (countInFirstMap, countInSecondMap) -> {
- countInFirstMap.addAll(countInSecondMap);
- return countInFirstMap;
- }
- )));
+ -> Stream.concat(firstMap.entrySet().stream(), secondMap.entrySet().stream())
+ .collect(Collectors.toMap(Entry::getKey, Entry::getValue,
+ (countInFirstMap, countInSecondMap) -> {
+ countInFirstMap.addAll(countInSecondMap);
+ return countInFirstMap;
+ }
+ )));
List totals = new ArrayList<>();
if (allTransactionsByTypeAndAdjustment.isPresent()) {
allTransactionsByTypeAndAdjustment.get().forEach((transactionType, previewFundingTransactions) -> {
@@ -286,11 +286,13 @@ private Double calculateUndisbursedBalance(Map t.getAdjustmentType().equals(actualCategoryValueId)).
+ Collections.emptyList()).stream().filter(t ->
+ t.getAdjustmentType().equals(actualCategoryValueId)).
collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount));
Double totalActualDisbursements = transactions.getOrDefault(ArConstants.DISBURSEMENT.toLowerCase(),
- Collections.emptyList()).stream().filter(t -> t.getAdjustmentType().equals(actualCategoryValueId)).
+ Collections.emptyList()).stream().filter(t ->
+ t.getAdjustmentType().equals(actualCategoryValueId)).
collect(Collectors.summingDouble(PreviewFundingTransaction::getTransactionAmount));
return totalActualCommitments != 0 || totalActualDisbursements != 0
@@ -344,33 +346,33 @@ public List getWorkspaces(Long activityId) {
.collect(Collectors.toList());
final StringBuffer wsQueries = new StringBuffer();
+
for (AmpTeam team : computedTeams) {
String wsQuery = WorkspaceFilter.generateWorkspaceFilterQueryForTeam(team.getAmpTeamId());
if (wsQueries.length() > 0) {
wsQueries.append(" UNION ");
}
-
wsQueries.append(AmpMessageWorker.addTeamIdToQuery(wsQuery, team.getAmpTeamId(), team.getName()));
}
final Map> activityTeams = new HashMap<>();
-
- PersistenceManager.getSession().doWork(conn -> {
- RsInfo teamsInActivityQuery = SQLUtils.rawRunQuery(conn, wsQueries.toString(), null);
- while (teamsInActivityQuery.rs.next()) {
- // activityTeams
- Long ampActivityId = teamsInActivityQuery.rs.getLong(1);
- if (activityTeams.get(ampActivityId) == null) {
- activityTeams.put(ampActivityId, new ArrayList<>());
+ if (computedTeams.size() > 0) {
+ PersistenceManager.getSession().doWork(conn -> {
+ RsInfo teamsInActivityQuery = SQLUtils.rawRunQuery(conn, wsQueries.toString(), null);
+ while (teamsInActivityQuery.rs.next()) {
+ // activityTeams
+ Long ampActivityId = teamsInActivityQuery.rs.getLong(1);
+ if (activityTeams.get(ampActivityId) == null) {
+ activityTeams.put(ampActivityId, new ArrayList<>());
+ }
+ activityTeams.get(ampActivityId).add(
+ new Team(teamsInActivityQuery.rs.getLong(2),
+ teamsInActivityQuery.rs.getString(TEAM_NAME_INDEX)));
}
- activityTeams.get(ampActivityId).add(
- new Team(teamsInActivityQuery.rs.getLong(2),
- teamsInActivityQuery.rs.getString(TEAM_NAME_INDEX)));
- }
- teamsInActivityQuery.close();
- });
-
+ teamsInActivityQuery.close();
+ });
+ }
if (activityTeams.containsKey(activityId)) {
for (Team team : activityTeams.get(activityId)) {
previewWorkspaces.add(new PreviewWorkspace(team.getTeamName(), PreviewWorkspace.Type.COMPUTED));
@@ -395,17 +397,17 @@ private void populateRegionalFunding(PreviewActivityFunding activityFunding, Amp
activityFunding.getRegionalCommitments().addAll(
getAmpRegionalFundings(regionalFundingPerTransaction, Constants.COMMITMENT)
.stream().map(ampRegionalFunding ->
- generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
+ generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
collect(Collectors.toList()));
activityFunding.getRegionalDisbursements().addAll(
getAmpRegionalFundings(regionalFundingPerTransaction, Constants.DISBURSEMENT)
.stream().map(ampRegionalFunding ->
- generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
+ generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
collect(Collectors.toList()));
activityFunding.getRegionalExpenditures().addAll(
getAmpRegionalFundings(regionalFundingPerTransaction, Constants.EXPENDITURE).
stream().map(ampRegionalFunding ->
- generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
+ generateRegionalFundingTransaction(ampRegionalFunding, currencyTo)).
collect(Collectors.toList()));
}
@@ -426,7 +428,7 @@ private PreviewRegionalFundingItem generateRegionalFundingTransaction(AmpRegiona
pfr.setTransactionDate(ampRegionalFunding.getTransactionDate());
pfr.setTransactionAmount(AmpCurrencyConvertor.getInstance().convertAmount(ampRegionalFunding.
getTransactionAmount(), ampRegionalFunding.getCurrency().getCurrencyCode(),
- currencyTo.getCurrencyCode(), transactionDate));
+ currencyTo.getCurrencyCode(), transactionDate));
return pfr;
}
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/calendar/CalendarEndpoint.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/calendar/CalendarEndpoint.java
index dd00cbc386e..64bd5958292 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/calendar/CalendarEndpoint.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/calendar/CalendarEndpoint.java
@@ -24,7 +24,7 @@ public class CalendarEndpoint {
@GET
@Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
- @ApiMethod(authTypes = AuthRule.AUTHENTICATED, id = "getContact", ui = false)
+ @ApiMethod(id = "getCalendar", ui = false)
@ApiOperation("Retrieve calendars.")
public List getCalendars(@QueryParam("id") List id) {
return CalendarUtil.getCalendars(id);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpConfiguration.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpConfiguration.java
index ce49ea7ccb3..6ef52874d97 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpConfiguration.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpConfiguration.java
@@ -51,6 +51,7 @@
/**
* This class should have all end point related to the configuration of amp
+ *
* @author Diego Dimunzio
*/
@Path("amp")
@@ -140,7 +141,7 @@ public Response getAmpOfflineReleaseFile(@ApiParam("Release id") @PathParam("id"
@GET
@Path("global-settings")
@Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
- @ApiMethod(ui=false, id = "global-settings", authTypes = AuthRule.AUTHENTICATED)
+ @ApiMethod(ui = false, id = "global-settings", authTypes = AuthRule.AUTHENTICATED)
@ApiOperation(value = "Returns all AMP Global Settings.")
@ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK,
message = "Response is a map containing all global settings where "
@@ -153,6 +154,23 @@ public Map getGlobalSettings() {
AmpGlobalSettings::getGlobalSettingsValue));
}
+ @GET
+ @Path("global-settings/public")
+ @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
+ @ApiMethod(ui = false, id = "public-global-settings")
+ @ApiOperation(value = "Returns all public AMP Global Settings.")
+ @ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK,
+ message = "Response is a map containing all public global settings where "
+ + "key is setting name and value is setting value."))
+ public Map getPublicGlobalSettings() {
+ return FeaturesUtil.getGlobalSettings().stream()
+ .filter(s -> s.getGlobalSettingsValue() != null
+ && PublicGlobalSettings.SETTINGS.contains(s.getGlobalSettingsName()))
+ .collect(Collectors.toMap(
+ AmpGlobalSettings::getGlobalSettingsName,
+ AmpGlobalSettings::getGlobalSettingsValue));
+ }
+
@GET
@Path("compatible-version-range")
@Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
@@ -182,7 +200,7 @@ public AmpOfflineCompatibleVersionRange addCompatibleVersionRange(AmpOfflineComp
@ApiMethod(id = "updateCompatibleVersionRange", ui = false, authTypes = AuthRule.IN_ADMIN)
@ApiOperation("Update an existing version range that denotes AMP Offline compatibility.")
public AmpOfflineCompatibleVersionRange updateCompatibleVersionRange(@PathParam("id") Long id,
- AmpOfflineCompatibleVersionRange versionRange) {
+ AmpOfflineCompatibleVersionRange versionRange) {
try {
versionRange.setId(id);
return ampVersionService.updateCompatibleVersionRange(versionRange);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java
index 6e4d2931678..c3a370229f8 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/AmpGeneralSettings.java
@@ -133,6 +133,17 @@ public class AmpGeneralSettings {
@JsonProperty(SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE)
private String gisDefaultMinYearRange;
+ @JsonProperty(SettingsConstants.REPORT_DEFAULT_MAX_DATE)
+ private String reportDefaultMaxDate;
+
+ @JsonProperty(SettingsConstants.REPORT_DEFAULT_MIN_DATE)
+ private String reportDefaultMinDate;
+
+ @JsonProperty(SettingsConstants.REPORT_DEFAULT_MAX_YEAR_RANGE)
+ private String reportDefaultMaxYearRange;
+ @JsonProperty(SettingsConstants.REPORT_DEFAULT_MIN_YEAR_RANGE)
+ private String reportDefaultMinYearRange;
+
public Boolean getUseIconsForSectorsInProjectList() {
return useIconsForSectorsInProjectList;
}
@@ -476,4 +487,37 @@ public Integer getNddMappingProgramLevel() {
public void setNddMappingProgramLevel(Integer nddMappingProgramLevel) {
this.nddMappingProgramLevel = nddMappingProgramLevel;
}
+
+ public String getReportDefaultMinDate() {
+ return reportDefaultMinDate;
+ }
+
+ public void setReportDefaultMinDate(String reportDefaultMinDate) {
+ this.reportDefaultMinDate = reportDefaultMinDate;
+ }
+
+
+ public String getReportDefaultMaxDate() {
+ return reportDefaultMaxDate;
+ }
+
+ public void setReportDefaultMaxDate(String reportDefaultMaxDate) {
+ this.reportDefaultMaxDate = reportDefaultMaxDate;
+ }
+
+ public void setReportDefaultMaxYearRange(String reportDefaultMaxYearRange) {
+ this.reportDefaultMaxYearRange = reportDefaultMaxYearRange;
+ }
+
+ public void setReportDefaultMinYearRange(String reportDefaultMinYearRange) {
+ this.reportDefaultMinYearRange = reportDefaultMinYearRange;
+ }
+
+ public String getReportDefaultMaxYearRange() {
+ return reportDefaultMaxYearRange;
+ }
+
+ public String getReportDefaultMinYearRange() {
+ return reportDefaultMinYearRange;
+ }
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java
index f57edebd5be..979907ac3ac 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/EPConstants.java
@@ -57,7 +57,7 @@ public class EPConstants {
public static final String SUMMARY = "summary";
public static final String GROUPING_OPTION = "groupingOption";
public static final String INCLUDE_LOCATION_CHILDREN = "include-location-children";
-
+
// report type & activities configurations
public static final String DEFAULT_REPORT_TYPE = "D";
/** maps API report type to internal report type ids */
@@ -65,26 +65,27 @@ public class EPConstants {
put("D", ArConstants.DONOR_TYPE);
put("C", ArConstants.COMPONENT_TYPE);
put("P", ArConstants.PLEDGES_TYPE);
+ put("R", ArConstants.REGIONAL_TYPE);
}};
-
+
public static final Map> REPORT_TYPE_ACTIVITY_MAP = new HashMap>() {{
put("D", ActivityType.STR_VALUES);
put("C", Arrays.asList(ActivityType.ACTIVITY.toString(), ActivityType.SSC_ACTIVITY.toString()));
put("P", Arrays.asList(ActivityType.PLEDGE.toString()));
}};
-
+
public static final String ERROR = "error";
public static final String NA = "N/A";
-
+
public static final String FILTERS = "filters";
-
+
// settings
public static final String SETTINGS = "settings";
-
+
// map import/export
public static final String API_STATE_REPORT_EXPORT_DESCRIPTION = "Export to Map";
public static final String API_STATE_REPORT_EXPORT = "reportExportId=";
-
+
// fm constants
public static final String REPORTING_FIELDS = "reporting-fields";
public static final String ENABLED_MODULES = "enabled-modules";
@@ -116,7 +117,7 @@ public class EPConstants {
public static final String ISO8601_DATE_AND_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
public static final String ISO8601_DATE_FORMAT = "yyyy-MM-dd";
-
+ public static final String ACTIVITY_DOCUMENTS = "activity_documents";
/**
* Map containing the length of date strings used for validation
* "2019-02-26T11:08:56.235-0200" - 28 characters
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/PublicGlobalSettings.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/PublicGlobalSettings.java
new file mode 100644
index 00000000000..394cdf52958
--- /dev/null
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/PublicGlobalSettings.java
@@ -0,0 +1,12 @@
+package org.digijava.kernel.ampapi.endpoints.common;
+
+import java.util.Arrays;
+import java.util.List;
+
+public final class PublicGlobalSettings {
+ private PublicGlobalSettings() {
+
+ }
+
+ public static final List SETTINGS = Arrays.asList("Default Calendar");
+}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java
index b0ad6dceacc..f3fc4095114 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/common/valueproviders/OrganisationValueProvider.java
@@ -27,6 +27,9 @@ public Object getExtraInfo(AmpOrganisation organisation) {
if (organisation.getCountry() != null && organisation.getCountry().getTemplate() != null) {
builder.put("template", organisation.getCountry().getTemplate().getId());
}
+ if (organisation.getOrgCode() != null){
+ builder.put("organization_code", organisation.getOrgCode());
+ }
return builder.build();
}
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java
index 36ae948b968..c60a518a83a 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java
@@ -371,6 +371,21 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar
Map> values = new TreeMap<>(); // Map>
ReportOutputColumn toaCol = report.leafHeaders.get(0);
+
+ String fundingTypeConstant = DashboardConstants.FUNDING_TYPE;
+ String title = TranslatorWorker.translateText(fundingTypeConstant);
+ List outValues = new ArrayList<>();
+
+
+ // check if report has report contents
+ if (report.isEmpty) {
+ retlist.setValues(outValues);
+ retlist.setName(fundingTypeConstant);
+ retlist.setTitle(title);
+
+ return retlist;
+ }
+
for (ReportArea toaArea : report.reportContents.getChildren()) {
String toa = toaArea.getContents().get(toaCol).displayedValue;
long toaId = toaArea.getOwner().id;
@@ -391,7 +406,7 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar
//values.computeIfAbsent(year, yr -> new ArrayList<>()).add(toaBean);
}
}
- List outValues = new ArrayList<>();
+
for (String yearValue : values.keySet()) {
FundingTypeAmountsForYear yearBean = new FundingTypeAmountsForYear();
yearBean.setYear(yearValue);
@@ -400,8 +415,8 @@ public static FundingTypeChartData getFundingTypeChartData(SettingsAndFiltersPar
}
retlist.setValues(outValues);
- retlist.setName(DashboardConstants.FUNDING_TYPE);
- retlist.setTitle(TranslatorWorker.translateText(DashboardConstants.FUNDING_TYPE));
+ retlist.setName(fundingTypeConstant);
+ retlist.setTitle(title);
retlist.setSource(getSource());
return retlist;
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java
index e59b6e7b334..a4713b09b63 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopChartType.java
@@ -14,7 +14,8 @@ public enum TopChartType {
@JsonProperty("re") RE,
@JsonProperty("ps") PS,
@JsonProperty("dg") DG,
- @JsonProperty("ndd") NDD;
+ @JsonProperty("ndd") NDD,
+ @JsonProperty("pr") PR;
public static TopChartType fromString(String value) {
value = value.toUpperCase();
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java
index 09674f42bc8..6ece8cd50bb 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/TopsChartService.java
@@ -1,5 +1,7 @@
package org.digijava.kernel.ampapi.endpoints.dashboards.services;
+import com.google.common.base.CharMatcher;
+import org.apache.commons.lang3.StringUtils;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.newreports.AmountCell;
@@ -153,6 +155,15 @@ private void prepare() {
title = TranslatorWorker.translateText(DashboardConstants.TOP_DONOR_GROUPS);
name = DashboardConstants.TOP_DONOR_GROUPS;
break;
+ case PR:
+ String selectedProgramScheme = (String) config.getSettings().get("program-settings");
+ String fundingType = (String) config.getSettings().get("funding-type");
+ setColumn(selectedProgramScheme);
+ applyFilter(FilterUtils.INSTANCE.idFromColumnName(fundingType));
+
+ title = TranslatorWorker.translateText(DashboardConstants.TOP_PROGRAMS);
+ name = DashboardConstants.TOP_PROGRAMS;
+ break;
case NDD:
setColumn(ColumnConstants.SECONDARY_PROGRAM_LEVEL_1);
applyFilter(FilterUtils.INSTANCE.idFromColumnName(ColumnConstants.SECONDARY_PROGRAM_LEVEL_1));
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java
index 09d884c7789..6f68a3264a6 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/datafreeze/DataFreezeUtil.java
@@ -90,7 +90,7 @@ private static Query createHibernateQuery(String queryString) {
}
public static List getDataFreeEventsList(Integer offset, Integer count, String orderBy,
- String sort, Integer total) {
+ String sort, Integer total) {
Integer maxResults = count == null ? DataFreezeConstants.DEFAULT_RECORDS_PER_PAGE : count;
Integer startAt = (offset == null || offset > total) ? DataFreezeConstants.DEFAULT_OFFSET : offset;
String orderByColumn = (orderBy == null) ? DataFreezeConstants.DEFAULT_SORT_COLUMN : orderBy;
@@ -133,7 +133,7 @@ public void execute(Connection conn) throws SQLException {
}
public static void freezeActivitiesForFreezingDate(AmpDataFreezeSettings currentFreezingEvent,
- Set activitiesId) {
+ Set activitiesId) {
SimpleDateFormat fullDateNoHourFormatter = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat yearFormatter = new SimpleDateFormat("yyyy");
final String fullDate = fullDateNoHourFormatter.format(currentFreezingEvent.getFreezingDate()) + " 23:59:59";
@@ -171,7 +171,7 @@ public static void unfreezeAll() {
/**
* Return a freezing event if today is the freezing date
- *
+ *
* @return
*/
public static AmpDataFreezeSettings getCurrentFreezingEvent() {
@@ -188,13 +188,18 @@ private static Long getLastNonExecutedFreezingEvent() {
PersistenceManager.getSession().doWork(new Work() {
public void execute(Connection conn) throws SQLException {
- String todaysFreezingEventQuery = "SELECT max(id) FROM amp_data_freeze_settings "
- + " WHERE CURRENT_DATE >=(freezing_date::date + coalesce(grace_period, 0)) "
- + " AND executed = FALSE AND enabled = TRUE "
- + " AND (freezing_date::date + coalesce(grace_period, 0)) = "
- + " (SELECT min((freezing_date::date + coalesce(grace_period, 0))) "
- + " FROM amp_data_freeze_settings WHERE executed = FALSE AND enabled = TRUE "
- + " and CURRENT_DATE <=(freezing_date::date + coalesce(grace_period, 0)))";
+ String todaysFreezingEventQuery = "SELECT max(id)" +
+ " FROM amp_data_freeze_settings" +
+ " WHERE CURRENT_DATE >= (freezing_date::date + coalesce(grace_period, 0))" +
+ " AND executed = FALSE" +
+ " AND enabled = TRUE" +
+ " AND (freezing_date::date + coalesce(grace_period, 0)) =" +
+ " coalesce((SELECT min((freezing_date::date + coalesce(grace_period, 0)))" +
+ " FROM amp_data_freeze_settings" +
+ " WHERE executed = FALSE" +
+ " AND enabled = TRUE" +
+ " and CURRENT_DATE <= (freezing_date::date + coalesce(grace_period, 0)))," +
+ " (freezing_date::date + coalesce(grace_period, 0)))";
RsInfo rsi = SQLUtils.rawRunQuery(conn, todaysFreezingEventQuery, null);
if (rsi.rs.next()) {
freezingEventId.value = rsi.rs.getLong(1);
@@ -225,7 +230,7 @@ public static List getEnabledDataFreezeEvents(
/**
* Get list of active users and assigned to workspaces
- *
+ *
* @return List users
*/
public static List getUsers() {
@@ -235,11 +240,11 @@ public static List getUsers() {
+ "where user.banned = false";
Query query = session.createQuery(teamMembersQuery);
List teamMembers = query.list();
-
+
Set users = teamMembers.stream()
.map(AmpTeamMember::getUser)
.collect(Collectors.toSet());
-
+
return new ArrayList(users);
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/FiltersConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/FiltersConstants.java
index 1a37f94d820..1baa417b765 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/FiltersConstants.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/FiltersConstants.java
@@ -151,7 +151,7 @@ public class FiltersConstants {
public static final String PRIMARY_PROGRAM_LEVEL_6 = "primary-program-level-6";
public static final String PRIMARY_PROGRAM_LEVEL_7 = "primary-program-level-7";
public static final String PRIMARY_PROGRAM_LEVEL_8 = "primary-program-level-8";
- public static final String INDIRECT_PRIMARY_PROGRAM_LEVEL = "primary-program-level";
+ public static final String INDIRECT_PRIMARY_PROGRAM_LEVEL = "indirect-primary-program-level";
public static final String INDIRECT_PRIMARY_PROGRAM_LEVEL_0 = INDIRECT_PRIMARY_PROGRAM_LEVEL + "-0";
public static final String INDIRECT_PRIMARY_PROGRAM_LEVEL_1 = INDIRECT_PRIMARY_PROGRAM_LEVEL + "-1";
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java
index b2a2af57d35..8adc36bf846 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/filters/LocationFilterListManager.java
@@ -18,7 +18,7 @@
import com.google.common.collect.ImmutableMap;
import org.digijava.kernel.ampapi.endpoints.common.EndpointUtils;
-import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.util.LocationUtil;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.dbentity.AmpApplicationSettings;
import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
@@ -122,19 +122,8 @@ protected Map> getLocationListItems(boolean sho
*/
protected List getCountriesWithChildrenIds(boolean pShowAllCountries) {
- Session session = PersistenceManager.getSession();
-
- String queryString = "SELECT loc FROM " + AmpCategoryValueLocations.class.getName()
- + " loc WHERE loc.parentLocation IS NULL "
- + " AND (loc.deleted != true)";
- if (!pShowAllCountries) {
- queryString += " AND (loc.id IN (SELECT DISTINCT parentLocation FROM "
- + AmpCategoryValueLocations.class.getName() + "))";
- }
-
- Query qry = session.createQuery(queryString);
- qry.setCacheable(true);
- Collection countryCollection = qry.list();
+ Collection countryCollection =
+ LocationUtil.getCountriesWithChildren(pShowAllCountries);
AmpApplicationSettings appSettings = EndpointUtils.getAppSettings();
final boolean showAllCountries = appSettings == null ? false : appSettings.getShowAllCountries();
@@ -143,7 +132,8 @@ protected List getCountriesWithChildrenIds(boolean pShowAllCountries) {
List countryIds = countryCollection
.stream()
- .filter(country -> showAllCountries || pShowAllCountries || country.getIso().equals(defaultCountryIso))
+ .filter(country -> showAllCountries || pShowAllCountries
+ || country.getIso().equals(defaultCountryIso) || defaultCountryIso.equals("zz"))
.map(country -> country.getId())
.collect(Collectors.toList());
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
index 54b3a7a3ad0..acf697fcb65 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
@@ -70,7 +70,14 @@ public class SettingsConstants {
public static final String GIS_DEFAULT_MAX_DATE = "gis-default-max-date";
public static final String GIS_DEFAULT_MIN_DATE = "gis-default-min-date";
+ public static final String REPORT_DEFAULT_MAX_DATE = "report-default-max-date";
+ public static final String REPORT_DEFAULT_MIN_DATE = "report-default-min-date";
+
+ public static final String REPORT_DEFAULT_MAX_YEAR_RANGE = "report-default-max-year-range";
+ public static final String REPORT_DEFAULT_MIN_YEAR_RANGE = "report-default-min-year-range";
+
+ public static final String PROGRAM_SETTINGS = "program-settings";
/** {id, value} map for settings fields ID-NAME map */
@@ -96,6 +103,7 @@ public class SettingsConstants {
put(YEAR_FROM, "From:");
put(YEAR_TO, "To:");
put(YEAR_ALL, "All");
+ put(PROGRAM_SETTINGS, "Program Settings");
put(SORT_COLUMN, GlobalSettingsConstants.DEFAULT_RESOURCES_SORT_COLUMN);
put(MAXIMUM_FILE_SIZE, GlobalSettingsConstants.CR_MAX_FILE_SIZE );
put(LIMIT_FILE_TO_UPLOAD, GlobalSettingsConstants.LIMIT_FILE_TYPE_FOR_UPLOAD);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java
index 2b6f52ad3fe..8348145b827 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsDefinitionsEndpoint.java
@@ -4,6 +4,7 @@
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCalendarCurrenciesField;
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCalendarField;
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getCurrencyField;
+import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getEnabledProgramField;
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getFundingTypeField;
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getReportAmountFormatField;
import static org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils.getReportAmountUnits;
@@ -53,7 +54,7 @@ public class SettingsDefinitionsEndpoint {
+ "funding type.")
public final List getSettingDefinitionsForDashboards() {
return Arrays.asList(getCurrencyField(true), getCalendarField(), getCalendarCurrenciesField(),
- getFundingTypeField(new LinkedHashSet<>(GisConstants.FUNDING_TYPES)));
+ getFundingTypeField(new LinkedHashSet<>(GisConstants.FUNDING_TYPES)), getEnabledProgramField());
}
@GET
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java
index f67e7fa8178..dddcd9230f7 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/settings/SettingsUtils.java
@@ -4,6 +4,7 @@
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.AmpARFilter;
+import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
import org.dgfoundation.amp.currency.ConstantCurrency;
import org.dgfoundation.amp.menu.AmpView;
@@ -24,6 +25,7 @@
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.util.SiteUtils;
+import org.digijava.module.aim.dbentity.AmpActivityProgramSettings;
import org.digijava.module.aim.dbentity.AmpApplicationSettings;
import org.digijava.module.aim.dbentity.AmpCurrency;
import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
@@ -37,6 +39,7 @@
import org.digijava.module.aim.util.DbUtil;
import org.digijava.module.aim.util.FeaturesUtil;
import org.digijava.module.aim.util.FiscalCalendarUtil;
+import org.digijava.module.aim.util.ProgramUtil;
import org.digijava.module.aim.util.ResourceManagerSettingsUtil;
import org.digijava.module.aim.util.TeamUtil;
import org.digijava.module.common.util.DateTimeUtil;
@@ -50,6 +53,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
/**
@@ -158,6 +162,35 @@ static SettingOptions getFundingTypeSettings(Set measures) {
return new SettingOptions(true, defaultId, options);
}
+ /**
+ * @return enabled program settings/schemes
+ */
+ private static SettingOptions getEnabledProgramSettings() {
+ List programSettings = ProgramUtil.getEnabledProgramSettings();
+ List options = new ArrayList<>();
+
+ programSettings.forEach(programSetting -> {
+ String programName = programSetting.getName();
+
+ if (Objects.equals(programName, ColumnConstants.PRIMARY_PROGRAM)) {
+ programName = ColumnConstants.PRIMARY_PROGRAM_LEVEL_1;
+ } else if (Objects.equals(programName, ColumnConstants.SECONDARY_PROGRAM)) {
+ programName = ColumnConstants.SECONDARY_PROGRAM_LEVEL_1;
+ }else if (Objects.equals(programName, ColumnConstants.TERTIARY_PROGRAM)) {
+ programName = ColumnConstants.TERTIARY_PROGRAM_LEVEL_1;
+ }else if (Objects.equals(programName, ColumnConstants.NATIONAL_PLAN_OBJECTIVE)) {
+ programName = ColumnConstants.NATIONAL_PLANNING_OBJECTIVES_LEVEL_1;
+ }
+
+ SettingOptions.Option option = new SettingOptions.Option(programName, String.valueOf(programSetting.getName()),true);
+ options.add(option);
+ });
+
+ String defaultId = options.size() > 0 ? options.get(0).value : null;
+ return new SettingOptions(defaultId, options);
+ }
+
+
/**
* Provides current report settings
*
@@ -231,7 +264,6 @@ private static SettingRange getReportYearRange(final ReportSettings settings) {
return null;
}
-
static SettingField getCalendarCurrenciesField() {
return getSettingFieldForOptions(SettingsConstants.CALENDAR_CURRENCIES_ID, getCalendarCurrencySettings());
}
@@ -248,6 +280,10 @@ static SettingField getFundingTypeField(Set measures) {
return getSettingFieldForOptions(SettingsConstants.FUNDING_TYPE_ID, getFundingTypeSettings(measures));
}
+ static SettingField getEnabledProgramField() {
+ return getSettingFieldForOptions(SettingsConstants.PROGRAM_SETTINGS, getEnabledProgramSettings());
+ }
+
static SettingField getReportAmountFormatField() {
DecimalFormat format = FormatHelper.getDefaultFormat();
final List formatFields = new ArrayList<>();
@@ -503,6 +539,13 @@ private static void addDateRangeSettingsForDashboardsAndGis(AmpGeneralSettings s
addDateSetting(settings, GlobalSettingsConstants.GIS_DEFAUL_MIN_YEAR_RANGE,
SettingsConstants.GIS_DEFAULT_MIN_DATE, SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE,
gsFiscalCalendar, currentCalendar, false);
+ addDateSetting(settings, Constants.GlobalSettings.END_YEAR_DEFAULT_VALUE,
+ SettingsConstants.REPORT_DEFAULT_MAX_DATE, SettingsConstants.REPORT_DEFAULT_MAX_DATE,
+ gsFiscalCalendar, currentCalendar, true);
+ addDateSetting(settings, Constants.GlobalSettings.START_YEAR_DEFAULT_VALUE,
+ SettingsConstants.REPORT_DEFAULT_MIN_DATE, SettingsConstants.REPORT_DEFAULT_MIN_DATE,
+ gsFiscalCalendar, currentCalendar, false);
+
}
private static void addDateSetting(AmpGeneralSettings settings, String globalSettingsName, String dateSettingsName,
@@ -518,6 +561,10 @@ private static void addDateSetting(AmpGeneralSettings settings, String globalSet
settings.setGisDefaultMaxYearRange(yearNumber);
} else if (yearSettingsName.equals(SettingsConstants.GIS_DEFAULT_MIN_YEAR_RANGE)) {
settings.setGisDefaultMinYearRange(yearNumber);
+ } else if (yearSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MAX_YEAR_RANGE)) {
+ settings.setReportDefaultMaxYearRange(yearNumber);
+ } else if (yearSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MIN_YEAR_RANGE)) {
+ settings.setReportDefaultMinYearRange(yearNumber);
}
if (!StringUtils.equals(yearNumber, "-1")) {
@@ -541,6 +588,10 @@ private static void addDateSetting(AmpGeneralSettings settings, String globalSet
settings.setGisDefaultMaxDate(formattedDate);
} else if (dateSettingsName.equals(SettingsConstants.GIS_DEFAULT_MIN_DATE)) {
settings.setGisDefaultMinDate(formattedDate);
+ } else if (dateSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MAX_DATE)) {
+ settings.setReportDefaultMaxDate(formattedDate);
+ } else if (dateSettingsName.equals(SettingsConstants.REPORT_DEFAULT_MIN_DATE)) {
+ settings.setReportDefaultMinDate(formattedDate);
}
}
}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java
index 23683b5f7ea..6d3b1283377 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/DashboardConstants.java
@@ -29,4 +29,5 @@ public class DashboardConstants {
public static final String X_COLUMN = "xColumn";
public static final String Y_COLUMN = "yColumn";
-}
+
+ public static final String TOP_PROGRAMS = "Top Programs";}
diff --git a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java
index dc1d838bca6..76eaf95e528 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/util/GisConstants.java
@@ -53,6 +53,8 @@ public class GisConstants {
add(MeasureConstants.BILATERAL_SSC_DISBURSEMENTS);
add(MeasureConstants.TRIANGULAR_SSC_COMMITMENTS);
add(MeasureConstants.TRIANGULAR_SSC_DISBURSEMENTS);
+ add(MeasureConstants.PROJECTION_MTEF_PROJECTIONS);
+ add(MeasureConstants.PIPELINE_MTEF_PROJECTIONS);
}};
public static final Map ADM_TO_IMPL_CATEGORY_VALUE = new HashMap() {{
diff --git a/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java b/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java
index d24fee87030..efaace053a9 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/content/ContentRepositoryManager.java
@@ -132,9 +132,10 @@ public static Session getWriteSession(HttpServletRequest request) {
request.setAttribute(JCR_WRITE_SESSION, writeSession);
} else {
writeSession.save();
- registerNamespace(writeSession, "ampdoc", AMP_DOC_NAMESPACE);
- registerNamespace(writeSession, "amplabel", AMP_LABLE_NAMESPACE);
}
+
+ registerNamespace(writeSession, "ampdoc", AMP_DOC_NAMESPACE);
+ registerNamespace(writeSession, "amplabel", AMP_LABLE_NAMESPACE);
registerObservers(writeSession);
} catch (RepositoryException e) {
throw new RuntimeException(e.getMessage(), e);
diff --git a/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java b/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java
index f0087eac24c..0ea99f42337 100644
--- a/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java
+++ b/amp/WEB-INF/src/org/digijava/kernel/mail/DgEmailManager.java
@@ -466,15 +466,7 @@ public static void sendMail(Address[] to, String from, Address[] cc, Address[] b
public static void sendMail(Address[] to, String from, Address[] cc, Address[] bcc, String subject, String text, String charset, boolean asHtml,
boolean log, boolean rtl) throws java.lang.Exception {
- String toEmails = "";
- if (to != null) {
- toEmails = "[" + String.join(", ",
- Arrays.asList(to).stream().map(Address::toString).collect(Collectors.toList())) + "]";
- }
- emailLogger.debug("Sending mail from " + from + " to " + (to != null ? toEmails : "none")
- + " recipient(s). Subject: "
- + subject + ". Encoding: " + charset + ". asHtml: " + asHtml);
- emailLogger.debug("Mail text:\n" + text);
+ logEmail(to, from, subject, text, charset, asHtml);
if (!EMAIL_SENDING_ENABLED) {
return;
@@ -560,17 +552,38 @@ public static void sendMail(Address[] to, String from, Address[] cc, Address[] b
throw ex;
}
}
-
-
+
+ private static void logEmail(Address[] to, String from, String subject, String text, String charset, boolean asHtml) {
+ String toEmails = "";
+ if (to != null) {
+ toEmails = "[" + String.join(", ",
+ Arrays.asList(to).stream().map(Address::toString).collect(Collectors.toList())) + "]";
+ }
+ emailLogger.debug("Sending mail from " + from + " to " + (to != null ? toEmails : "none")
+ + " recipient(s). Subject: "
+ + subject + ". Encoding: " + charset + ". asHtml: " + asHtml);
+ emailLogger.debug("Mail text:\n" + text);
+ }
+
+
public static void sendMail(Address[] to,String from,AmpMessage ampMessage,Sdm attachmentsHolder) throws Exception{
- // Get SMTP object from configuration file, see digi.xml for more details
+ // Get SMTP object from configuration file, see digi.xml for more detail
+ String subject = ampMessage.getName();
+ String text = ampMessage.getDescription();
+
+ logEmail(to, from, subject, text, DEFAULT_ENCODING, false);
+
+ if (!EMAIL_SENDING_ENABLED) {
+ return;
+ }
+
Smtp smtp = DigiConfigManager.getConfig().getSmtp();
ForwardEmails forwardEmails = DigiConfigManager.getConfig().getForwardEmails();
// Mail session needs property,
// we create default property key and fill it
Properties props = new Properties();
- props.put("mail.smtp.host", smtp.getHost());
+ props.put("mail.smtp.host", smtp.getHost());
if (smtp.getUserName() != null && smtp.getUserPassword() != null) {
props.put("mail.smtp.auth", "true");
}
@@ -590,11 +603,11 @@ public static void sendMail(Address[] to,String from,AmpMessage ampMessage,Sdm a
}
message.setFrom(new InternetAddress(from));
message.addRecipients(Message.RecipientType.TO, to);
- message.setSubject(ampMessage.getName(),DEFAULT_ENCODING);
+ message.setSubject(subject,DEFAULT_ENCODING);
message.setSentDate(new Date());
// Set the email message text.
MimeBodyPart messagePart = new MimeBodyPart();
- messagePart.setText(ampMessage.getDescription());
+ messagePart.setText(text);
Multipart multipart = new MimeMultipart();
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/ChangePassword.java b/amp/WEB-INF/src/org/digijava/module/aim/action/ChangePassword.java
index 19d5f2c19fc..48257adeb5c 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/action/ChangePassword.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/action/ChangePassword.java
@@ -11,6 +11,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.digijava.module.aim.form.ChangePasswordForm;
+import org.digijava.module.aim.util.TeamUtil;
import org.digijava.module.um.util.DbUtil;
import org.digijava.kernel.security.PasswordPolicyValidator;
@@ -23,7 +24,6 @@ public ActionForward execute(ActionMapping mapping,
HttpServletRequest request,
HttpServletResponse response) throws java.lang.Exception {
-
ChangePasswordForm cpForm = (ChangePasswordForm) form;
ActionMessages errors = new ActionMessages();
if (!PasswordPolicyValidator.isValid(cpForm.getNewPassword(), cpForm.getUserId())) {
@@ -59,6 +59,7 @@ public ActionForward execute(ActionMapping mapping,
saveErrors(request, errors);
return mapping.getInputForward();
}
+
return mapping.findForward("success");
} else {
return mapping.findForward("changePassword");
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java
index 48b75f07c73..2171c7460ca 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/action/EditOrganisation.java
@@ -103,14 +103,13 @@ private boolean sessionChkForWInfo(HttpServletRequest request) {
}
return false;
}
-
- @Override
- protected ActionForward unspecified(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response)throws Exception {
- if (sessionChk(request)) {
- return mapping.findForward("index");
- }
- return create(mapping, form, request, response);
- }
+
+ @Override
+ protected ActionForward unspecified(
+ ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ return mapping.findForward(sessionChk(request) ? "index" : "added");
+ }
public ActionForward create(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception {
if (sessionChk(request)) {
@@ -371,29 +370,29 @@ public ActionForward delete(ActionMapping mapping, ActionForm form,HttpServletRe
String topAmpIds = ampIds.stream().limit(MAX_ACTIVITIES).collect(Collectors.joining(", "));
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.aim.organizationManager.deleteOrgActError", topAmpIds));
- saveErrors(request, errors);
- editForm.setActionFlag("edit");
- return mapping.findForward("forward");
- } else {
+ }
+
AmpOrganisation org = DbUtil.getOrganisation(editForm.getAmpOrgId());
if (org.getCalendar() != null && org.getCalendar().size() > 0) {
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.aim.organizationManager.deleteOrgEventError"));
- saveErrors(request, errors);
- editForm.setActionFlag("edit");
- return mapping.findForward("forward");
-
}
List releatedTeams = TeamUtil.getTeamByOrg(editForm.getAmpOrgId());
if (releatedTeams != null && !releatedTeams.isEmpty()){
errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgTeamError"));
+ }
+
+ if (org.getUsers() != null && !org.getUsers().isEmpty()) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.aim.organizationManager.deleteOrgVerifiedOrgError"));
+ }
+
+ if (!errors.isEmpty()){
saveErrors(request, errors);
editForm.setActionFlag("edit");
return mapping.findForward("forward");
}
-
try {
DbUtil.deleteOrg(org);
} catch (JDBCException e) {
@@ -409,18 +408,23 @@ public ActionForward delete(ActionMapping mapping, ActionForm form,HttpServletRe
return mapping.findForward("added");
- }
}
private Set getAmpIdsWithOrg(Long orgId) {
Set ids = new TreeSet<>();
- ids.addAll(DbUtil.getAmpIdsByOrg(orgId));
- ids.addAll(ActivityUtil.getAmpIdsByFundingOrg(orgId));
- ids.addAll(DbUtil.getAmpIdsByInternalIdOrg(orgId));
+ addAllIfNotNull(ids, DbUtil.getAmpIdsByOrg(orgId));
+ addAllIfNotNull(ids, ActivityUtil.getAmpIdsByFundingOrg(orgId));
+ addAllIfNotNull(ids, DbUtil.getAmpIdsByInternalIdOrg(orgId));
return ids;
}
+ private void addAllIfNotNull(Set set, Collection collectionToAdd){
+ if (set != null && collectionToAdd != null && !collectionToAdd.isEmpty()){
+ set.addAll(collectionToAdd);
+ }
+ }
+
public ActionForward addStaffInfo(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception {
if (sessionChkForWInfo(request)) {
return mapping.findForward("index");
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java
index 8ad80e79040..9eeb54943a0 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/action/ShowChangePassword.java
@@ -4,6 +4,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.digijava.kernel.request.TLSUtils;
+import org.digijava.module.aim.form.ChangePasswordForm;
+import org.digijava.module.aim.helper.Constants;
+import org.digijava.module.aim.helper.TeamMember;
+import org.digijava.module.aim.util.TeamUtil;
+import org.jfree.util.Log;
public class ShowChangePassword extends Action {
@@ -14,7 +20,16 @@ public ActionForward execute(ActionMapping mapping,
response) throws
java.lang.Exception {
+ ChangePasswordForm cpForm = (ChangePasswordForm) form;
+ TeamMember tm = TeamUtil.getCurrentMember();
+
+ if (tm != null && tm.getEmail() != null) {
+ cpForm.setUserId(tm.getEmail());
+ cpForm.setUserIdEnabled(false);
+ }else {
+ cpForm.setUserIdEnabled(true);
+ }
return mapping.findForward("forward");
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java b/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java
index 7952f3b9fdf..422d7c55ace 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/action/WorkspaceManager.java
@@ -17,6 +17,7 @@
import org.digijava.kernel.request.TLSUtils;
import org.digijava.module.aim.dbentity.AmpTeam;
import org.digijava.module.aim.form.WorkspaceForm;
+import org.digijava.module.aim.form.helpers.WorkspaceDataSelection;
import org.digijava.module.aim.util.TeamUtil;
import org.digijava.module.search.util.SearchUtil;
import org.hibernate.Hibernate;
@@ -41,6 +42,20 @@ public ActionForward execute(ActionMapping mapping, ActionForm form,HttpServletR
Collection workspaces = new ArrayList();
WorkspaceForm wsForm = (WorkspaceForm) form;
+ ArrayList workspaceDataSelections = new ArrayList<>();
+
+ WorkspaceDataSelection members = new WorkspaceDataSelection();
+ members.setLabel("Members");
+ members.setValue("0");
+ workspaceDataSelections.add(members);
+
+ WorkspaceDataSelection activities = new WorkspaceDataSelection();
+ activities.setLabel("Activities");
+ activities.setValue("1");
+ workspaceDataSelections.add(activities);
+
+ wsForm.setWorkspaceDataSelections(workspaceDataSelections);
+
if (request.getParameter("reset") != null && request.getParameter("reset").equalsIgnoreCase("true")) {
wsForm.setKeyword(null);
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java
index 76eb8b1718e..e34831cbff0 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/annotations/interchange/ActivityFieldsConstants.java
@@ -85,6 +85,7 @@ public class ActivityFieldsConstants {
public static final String IATI_IDENTIFIER = "IATI Identifier";
public static final String UUID = "UUID";
+ public static final String LINE_MINISTRY_RANK ="^[1-5]$";
public static final class Locations {
private Locations() {
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java
index a5fc4e52585..4fec8c376b6 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityFields.java
@@ -33,6 +33,7 @@
import org.digijava.kernel.validators.activity.RegionLocationValidator;
import org.digijava.kernel.validators.activity.TreeCollectionValidator;
import org.digijava.kernel.validators.activity.UniqueActivityTitleValidator;
+import org.digijava.kernel.validators.common.RegexValidator;
import org.digijava.kernel.validators.common.TotalPercentageValidator;
import org.digijava.kernel.validators.common.RequiredValidator;
import org.digijava.kernel.validators.common.SizeValidator;
@@ -712,7 +713,12 @@ public abstract class AmpActivityFields extends Permissible implements Comparabl
@VersionableCollection(fieldTitle = "GPI Surveys")
protected Set gpiSurvey;
- @Interchangeable(fieldTitle = "Line Ministry Rank", importable = true, fmPath = "/Activity Form/Planning/Line Ministry Rank")
+ @Interchangeable(fieldTitle = "Line Ministry Rank", importable = true, fmPath = "/Activity Form/Planning/Line Ministry Rank",
+ interValidators = {
+ @InterchangeableValidator(
+ value = RegexValidator.class,
+ attributes = "regex=" + ActivityFieldsConstants.LINE_MINISTRY_RANK)
+ })
@VersionableFieldSimple(fieldTitle = "Line Ministry Rank")
protected Integer lineMinRank;
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java
index c8e1d7c944c..f7af1f80f57 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpActivityLocation.java
@@ -79,7 +79,19 @@ public Float getLocationPercentage() {
public void setLocationPercentage(Float locationPercentage) {
this.locationPercentage = locationPercentage;
}
-
+
+ public AmpActivityLocation() {
+ }
+
+ public AmpActivityLocation(AmpActivityVersion activity, AmpCategoryValueLocations location,
+ Float locationPercentage, String latitude, String longitude) {
+ this.activity = activity;
+ this.location = location;
+ this.locationPercentage = locationPercentage;
+ this.latitude = latitude;
+ this.longitude = longitude;
+ }
+
@Override
public boolean equalsForVersioning(Object obj) {
AmpActivityLocation aux = (AmpActivityLocation) obj;
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml
deleted file mode 100644
index d74fe695339..00000000000
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
- amp_analytical_report_seq
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java
deleted file mode 100644
index 9167c2b6529..00000000000
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpAnalyticalReport.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * AmpTeam.java
- * Created: 03-Sep-2004
- */
-
-package org.digijava.module.aim.dbentity;
-
-import java.io.Serializable;
-
-public class AmpAnalyticalReport implements Serializable {
-
- private static final long serialVersionUID = 1143719618673288389L;
-
- private Long id;
- private String data;
- private String name;
- private AmpTeamMember owner;
-
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
- public String getData() {
- return data;
- }
- public void setData(String data) {
- this.data = data;
- }
- public AmpTeamMember getOwner() {
- return owner;
- }
- public void setOwner(AmpTeamMember owner) {
- this.owner = owner;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
-}
-
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml
index 827a539e31d..e649c30de2b 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml
+++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.hbm.xml
@@ -143,6 +143,11 @@
+
+
+
+
+
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java
index 78171cdf742..e2883b05ad5 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/dbentity/AmpOrganisation.java
@@ -11,6 +11,7 @@
import org.dgfoundation.amp.ar.viewfetcher.InternationalizedModelDescription;
import org.digijava.kernel.ampapi.endpoints.common.valueproviders.OrganisationValueProvider;
import org.digijava.kernel.dbentity.Country;
+import org.digijava.kernel.user.User;
import org.digijava.module.aim.annotations.interchange.InterchangeableValue;
import org.digijava.module.aim.annotations.interchange.PossibleValueId;
import org.digijava.module.aim.annotations.translation.TranslatableClass;
@@ -117,6 +118,8 @@ public class AmpOrganisation implements Comparable, Identifiabl
private boolean translateable = true;
+ private Set users;
+
@OrganizationReportColumn(columnName="Line Ministry Registration Number",propertyType=PropertyType.NGO)
public String getLineMinRegNumber() {
return lineMinRegNumber;
@@ -734,4 +737,12 @@ public static String hqlStringForName(String idSource)
return InternationalizedModelDescription.getForProperty(AmpOrganisation.class, "name").getSQLFunctionCall(idSource + ".ampOrgId");
}
+ public Set getUsers() {
+ return users;
+ }
+
+ public void setUsers(Set users) {
+ this.users = users;
+ }
+
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/form/ChangePasswordForm.java b/amp/WEB-INF/src/org/digijava/module/aim/form/ChangePasswordForm.java
index 064927adb61..7645d07b8d5 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/form/ChangePasswordForm.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/form/ChangePasswordForm.java
@@ -13,6 +13,15 @@ public class ChangePasswordForm extends ValidatorForm {
private String newPassword = null;
private String conformNewPassword = null;
+ private boolean userIdEnabled = true;
+
+ public boolean getUserIdEnabled() {
+ return userIdEnabled;
+ }
+
+ public void setUserIdEnabled(boolean userIdEnabled) {
+ this.userIdEnabled = userIdEnabled;
+ }
public String getUserId() {
return this.userId;
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java b/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java
index a06b3fecaeb..00d3d0d3fd1 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/form/WorkspaceForm.java
@@ -1,9 +1,11 @@
package org.digijava.module.aim.form;
import java.util.Collection;
+import java.util.List;
import org.apache.struts.action.ActionForm;
import org.digijava.module.aim.dbentity.AmpTeam;
+import org.digijava.module.aim.form.helpers.WorkspaceDataSelection;
public class WorkspaceForm extends ActionForm {
@@ -14,6 +16,8 @@ public class WorkspaceForm extends ActionForm {
private int page;
private String workspaceType="all";
+
+ private List workspaceDataSelections;
private int numPerPage=-1;
@@ -23,6 +27,7 @@ public class WorkspaceForm extends ActionForm {
private Integer currentPage;
private Long selectedWs;
+
public Integer getCurrentPage() {
return currentPage;
}
@@ -123,5 +128,12 @@ public Long getWorkspaceGroup() {
return workspaceGroup;
}
-
+
+ public List getWorkspaceDataSelections() {
+ return workspaceDataSelections;
+ }
+
+ public void setWorkspaceDataSelections(List workspaceDataSelections) {
+ this.workspaceDataSelections = workspaceDataSelections;
+ }
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java b/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java
new file mode 100644
index 00000000000..e62457b809c
--- /dev/null
+++ b/amp/WEB-INF/src/org/digijava/module/aim/form/helpers/WorkspaceDataSelection.java
@@ -0,0 +1,22 @@
+package org.digijava.module.aim.form.helpers;
+
+public class WorkspaceDataSelection {
+ private String label;
+ private String value;
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java
index 038417f1cb2..fa431d92a94 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/helper/GlobalSettingsConstants.java
@@ -243,4 +243,6 @@ public class GlobalSettingsConstants {
*/
public final static Set SETTINGS_TO_HIDE = new HashSet<>(Arrays.asList(REPORT_WIZARD_VISIBILITY_SOURCE));
+ public static final String EXEMPT_ORGANIZATION_DOCUMENTS = "Exempt organization to see documents";
+
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java
index a3d13f1ac60..c670e7f9681 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java
@@ -116,11 +116,11 @@ public static List getComponents(Long actId) {
logger.info(" this is the other components getting called....");
try {
session = PersistenceManager.getRequestDBSession();
- String rewrittenColumns = SQLUtils.rewriteQuery("amp_components", "ac",
+ String rewrittenColumns = SQLUtils.rewriteQuery("amp_components", "ac",
new HashMap(){{
put("title", InternationalizedModelDescription.getForProperty(AmpComponent.class, "title").getSQLFunctionCall("ac.amp_component_id"));
put("description", InternationalizedModelDescription.getForProperty(AmpComponent.class, "description").getSQLFunctionCall("ac.amp_component_id"));
- }});
+ }});
String queryString = "select " + rewrittenColumns + " from amp_components ac " +
"where (ac.amp_activity_id=:actId)";
Query qry = session.createSQLQuery(queryString).addEntity(AmpComponent.class);
@@ -165,14 +165,14 @@ public static Collection searchActivities(Long ampThemeId,
oql += " order by act.name";
Query query = session.createQuery(oql);
-
+
setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember);
-
+
if (pageStart!=null && rowCount!=null){
query.setFirstResult(pageStart);
query.setMaxResults(rowCount);
}
-
+
result = query.list();
}
catch (Exception ex) {
@@ -215,8 +215,8 @@ public static Collection searchActivitieProgPercents(Long ampTheme
" from " + AmpActivityProgram.class.getName() + " prog ";
oql+= getSearchActivitiesWhereClause(ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember);
-
-
+
+
Query query = session.createQuery(oql);
setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember);
@@ -264,7 +264,7 @@ public static Integer searchActivitiesCount(Long ampThemeId,
Query query = session.createQuery(oql);
setSearchActivitiesQueryParams(query, ampThemeId, statusCode, donorOrgId, fromDate, toDate, locationId, teamMember);
-
+
result = (Integer)query.uniqueResult();
}
catch (Exception ex) {
@@ -294,9 +294,9 @@ public static String getSearchActivitiesWhereClause(Long ampThemeId,
Date toDate,
Long locationId,
TeamMember teamMember) {
-
+
String oql="";
-
+
if (ampThemeId!=null){
oql += " inner join prog.program as theme ";
}
@@ -352,7 +352,7 @@ public static String getSearchActivitiesWhereClause(Long ampThemeId,
whereTeamStatement.append(" and ( latestAct.team.ampTeamId =:teamId ) ");
}
}
-
+
}
if(relatedOrgsCriteria){
oql+=" inner join latestAct.orgrole role ";
@@ -390,11 +390,11 @@ public static void setSearchActivitiesQueryParams(Query query, Long ampThemeId,
Date toDate,
Long locationId,
TeamMember teamMember) {
-
+
if (ampThemeId != null) {
query.setLong("ampThemeId", ampThemeId.longValue());
}
-
+
if (fromDate != null) {
query.setDate("FromDate", fromDate);
}
@@ -407,7 +407,7 @@ public static void setSearchActivitiesQueryParams(Query query, Long ampThemeId,
if (teamMember!=null && teamMember.getTeamId()!=null&&!teamMember.getTeamAccessType().equals("Management")){
query.setLong("teamId", teamMember.getTeamId());
}
-
+
}
@SuppressWarnings("unchecked")
@@ -422,8 +422,8 @@ public static List getActivityLocations(Long activityId) {
return PersistenceManager.getSession().createSQLQuery(queryString).addEntity(AmpActivityLocation.class)
.setParameter("actId", activityId, LongType.INSTANCE).list();
}
-
-
+
+
/**
* Load activity from db.
* Use this one instead of method below this if you realy want to load all data.
@@ -473,7 +473,7 @@ public static AmpActivityVersion loadActivity(Long id) throws DgException {
ActivityUtil.setCurrentWorkspacePrefixIntoRequest(result);
ActivityUtil.initializeForApi(result);
-
+
} catch (ObjectNotFoundException e) {
logger.debug("AmpActivityVersion with id=" + id + " not found");
} catch (Exception e) {
@@ -536,11 +536,11 @@ public static List getActivitiesByAmpIds(List ampIds
.setParameterList("ampIds", ampIds)
.list();
}
-
+
public static AmpActivityVersion loadAmpActivity(Long id){
- return (AmpActivityVersion) PersistenceManager.getSession().load(AmpActivityVersion.class, id);
+ return (AmpActivityVersion) PersistenceManager.getSession().load(AmpActivityVersion.class, id);
}
-
+
public static List getAmpActivitySectors(Long actId) {
String queryString = "select a.* from amp_activity_sector a " + "where a.amp_activity_id=:actId";
return PersistenceManager.getSession().createSQLQuery(queryString).addEntity(AmpActivitySector.class)
@@ -575,6 +575,24 @@ public static AmpRole getAmpRole(Long actId, Long orgRoleId) {
return role;
}
+ public static List getAmpRolesForActivityAndOrganizationsAndRole(Long actId, List organizationId,
+ Long roleId) {
+ List ampOrgRoles = new ArrayList<>();
+ if (organizationId != null && organizationId.size() > 0) {
+ String queryString = "select ar from AmpOrgRole ar "
+ + " where ar.activity.ampActivityId = :actId "
+ + " and ar.organisation.ampOrgId in ( :orgId ) "
+ + " and ar.role.ampRoleId = :roleId ";
+ Query qry = PersistenceManager.getSession().createQuery(queryString);
+ qry.setParameter("actId", actId);
+ qry.setParameterList("orgId", organizationId);
+ qry.setParameter("roleId", roleId);
+ ampOrgRoles = qry.list();
+ }
+
+ return ampOrgRoles;
+ }
+
public static AmpOrganisation getAmpOrganisation(Long actId, Long orgRoleId) {
Session session = null;
AmpOrganisation organisation = null;
@@ -2106,7 +2124,7 @@ private static int daysBetween(Date d1, Date d2) {
public static int daysToValidation(AmpActivityVersion activity) {
int result;
- int daysBetween = daysBetween(activity.getUpdatedDate(), new Date());
+ int daysBetween = daysBetween(activity.getUpdatedDate() != null ? activity.getUpdatedDate(): new Date(), new Date());
String daysBeforeValidation = FeaturesUtil.getGlobalSettingValue(
GlobalSettingsConstants.NUMBER_OF_DAYS_BEFORE_AUTOMATIC_VALIDATION);
result = (Integer.parseInt(daysBeforeValidation) - daysBetween);
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java
index f2db485c5cf..bcce63a281e 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/DbUtil.java
@@ -1406,31 +1406,41 @@ public static void saveOrg(AmpOrganisation org) throws DgException {
if (organisationContacts != null) {
// this will remove all organisation contact which are linked to
// this organisation
- for (Iterator iterator = organisationContacts.iterator(); iterator.hasNext();) {
- AmpOrganisationContact ampOrganisationContact = (AmpOrganisationContact) iterator.next();
- if (org.getAmpOrgId() != null) {
- if (ampOrganisationContact.getId() != null) {
+ Iterator organisationContactIterator = organisationContacts.iterator();
+
+ while (organisationContactIterator.hasNext()) {
+ AmpOrganisationContact ampOrganisationContact = organisationContactIterator.next();
+
+ if(org.getAmpOrgId() != null) {
+ if(ampOrganisationContact.getId() != null) {
// AmpContact
// cont=ampOrganisationContact.getContact();
- AmpOrganisationContact contToBeRemoved = (AmpOrganisationContact) sess
- .get(AmpOrganisationContact.class, ampOrganisationContact.getId());
- if (contToBeRemoved != null) {
+ AmpOrganisationContact contToBeRemoved =
+ (AmpOrganisationContact) sess
+ .get(AmpOrganisationContact.class,
+ ampOrganisationContact.getId());
+ if(contToBeRemoved != null) {
AmpContact ampContact = contToBeRemoved.getContact();
sess.delete(contToBeRemoved);
- ampContact.getOrganizationContacts().remove(contToBeRemoved);
+ organisationContactIterator.remove();
+ ampContact.getOrganizationContacts()
+ .remove(contToBeRemoved);
sess.update(ampContact);
- org.getOrganizationContacts().remove(contToBeRemoved);
+
}
}
}
}
- // now re-save all organisation contacts
- for (AmpOrganisationContact organizationContact : organisationContacts) {
- // save or update contact
+ // Since you've modified the original set, need to get a new iterator
+ organisationContactIterator = organisationContacts.iterator();
+
+ while (organisationContactIterator.hasNext()) {
+ AmpOrganisationContact organizationContact = organisationContactIterator.next();
AmpContact contact = organizationContact.getContact();
AmpContact ampContact = null;
+
if (contact.getId() != null) { // contact already exists.
ampContact = (AmpContact) sess.get(AmpContact.class, contact.getId());
ampContact.setName(contact.getName());
@@ -1463,7 +1473,6 @@ public static void saveOrg(AmpOrganisation org) throws DgException {
}
// link org to cont
- AmpOrganisationContact newOrgCont = new AmpOrganisationContact();
organizationContact.setOrganisation(org);
organizationContact.setPrimaryContact(organizationContact.getPrimaryContact());
if (ampContact != null) {
@@ -1472,7 +1481,6 @@ public static void saveOrg(AmpOrganisation org) throws DgException {
organizationContact.setContact(contact);
}
sess.save(organizationContact);
-
}
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java
index 3143647f8dd..549d2f8e56f 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/IndicatorUtil.java
@@ -1,12 +1,9 @@
package org.digijava.module.aim.util;
-import java.sql.SQLException;
-import java.text.Collator;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.viewfetcher.InternationalizedModelDescription;
import org.digijava.kernel.exception.DgException;
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java
index 1e087c63acc..96f0196091d 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/LocationUtil.java
@@ -29,12 +29,14 @@
public final class LocationUtil {
private static Logger logger = Logger.getLogger(LocationUtil.class);
-
- private LocationUtil() { }
-
- public static final List LOCATIONS_COLUMNS_NAMES = Collections.unmodifiableList(
+
+ private LocationUtil() {
+ }
+
+ public static final List LOCATIONS_COLUMNS_NAMES = Collections.unmodifiableList(
Arrays.asList(ColumnConstants.LOCATION_ADM_LEVEL_0, ColumnConstants.LOCATION_ADM_LEVEL_1,
- ColumnConstants.LOCATION_ADM_LEVEL_2, ColumnConstants.LOCATION_ADM_LEVEL_3, ColumnConstants.LOCATION));
+ ColumnConstants.LOCATION_ADM_LEVEL_2, ColumnConstants.LOCATION_ADM_LEVEL_3,
+ ColumnConstants.LOCATION));
//End Search Location.
public static AmpLocation getAmpLocationByCVLocation(Long ampCVLocationId) {
@@ -43,121 +45,126 @@ public static AmpLocation getAmpLocationByCVLocation(Long ampCVLocationId) {
try {
session = PersistenceManager.getRequestDBSession();
-
- String queryString = "select l from " + AmpLocation.class.getName()
+
+ String queryString = "select l from " + AmpLocation.class.getName()
+ " l where location=:locationId order by l.ampLocationId";
Query qry = session.createQuery(queryString);
qry.setLong("locationId", ampCVLocationId);
-
- Collection result = qry.list();
- if ( result != null && result.size() > 0 ) {
- return (AmpLocation)result.iterator().next();
+
+ Collection result = qry.list();
+ if (result != null && result.size() > 0) {
+ return (AmpLocation) result.iterator().next();
}
-
+
} catch (Exception e) {
logger.error("Uanble to get location :" + e);
}
return loc;
-
+
}
+
public static AmpCategoryValueLocations getAmpLocationByGeoCode(String geoCode) {
Session session = null;
AmpCategoryValueLocations loc = null;
try {
session = PersistenceManager.getRequestDBSession();
-
- String queryString = "select l from " + AmpCategoryValueLocations.class.getName()
+
+ String queryString = "select l from " + AmpCategoryValueLocations.class.getName()
+ " l where l.geoCode =:geoCode order by l.id";
Query qry = session.createQuery(queryString);
qry.setString("geoCode", geoCode);
-
- Collection result = qry.list();
- if ( result != null && result.size() > 0 ) {
+
+ Collection result = qry.list();
+ if (result != null && result.size() > 0) {
return (AmpCategoryValueLocations) result.iterator().next();
}
-
+
} catch (Exception e) {
logger.error("Uanble to get location :" + e);
- }
+ }
return loc;
-
+
}
- /**
- * Returns list of locations using their ids
- * @param ids consists selected locations id separted by comma
- * @return List of AmpCategoryValueLocations beans
- * @throws DgException if anything goes wrong
- */
-
- public static List getAllLocations(String ids) throws DgException{
+
+ /**
+ * Returns list of locations using their ids
+ *
+ * @param ids consists selected locations id separted by comma
+ * @return List of AmpCategoryValueLocations beans
+ * @throws DgException if anything goes wrong
+ */
+
+ public static List getAllLocations(String ids) throws DgException {
Session session = null;
- List col = null;
+ List col = null;
try {
-
+
session = PersistenceManager.getRequestDBSession();
- String queryString = " from " + AmpCategoryValueLocations.class.getName()+
- " vl where vl.parentLocation is null " ;
-
- if(ids!=null&&ids.length()>0){
- String id=ids.substring(0, ids.length()-1);
- queryString+=" or vl.parentLocation in ("+id+")";
- }
+ String queryString = " from " + AmpCategoryValueLocations.class.getName()
+ + " vl where vl.parentLocation is null ";
+
+ if (ids != null && ids.length() > 0) {
+ String id = ids.substring(0, ids.length() - 1);
+ queryString += " or vl.parentLocation in (" + id + ")";
+ }
Query qry = session.createQuery(queryString);
col = qry.list();
} catch (Exception e) {
logger.error("Unable to get locations from database "
+ e.getMessage());
- throw new DgException(e);
- }
+ throw new DgException(e);
+ }
return col;
}
-
- public static List getAllCountriesAndRegions() {
- Session session = null;
- List col = null;
-
- try {
-
- session = PersistenceManager.getRequestDBSession();
- String queryString = " from " + AmpCategoryValueLocations.class.getName();
-
- Query qry = session.createQuery(queryString);
- col = qry.list();
- } catch (Exception e) {
- logger.error("Unable to get locations from database "
- + e.getMessage());
- throw new RuntimeException(e);
- }
- return col;
- }
-
- /**
- * Returns location using its id
- * @param id of location
- * @return AmpCategoryValueLocations bean
- * @throws DgException if anything goes wrong
- */
-
- public static AmpCategoryValueLocations getAmpCategoryValueLocationById(Long id) throws DgException {
- return (AmpCategoryValueLocations) PersistenceManager.getSession().load(AmpCategoryValueLocations.class, id);
+
+ public static List getAllCountriesAndRegions() {
+ Session session = null;
+ List col = null;
+
+ try {
+
+ session = PersistenceManager.getRequestDBSession();
+ String queryString = " from " + AmpCategoryValueLocations.class.getName();
+
+ Query qry = session.createQuery(queryString);
+ col = qry.list();
+ } catch (Exception e) {
+ logger.error("Unable to get locations from database "
+ + e.getMessage());
+ throw new RuntimeException(e);
}
-
- /**
- * Saves location into the database
- * @param b
- * @param AmpCategoryValueLocations bean
- * @throws DgException
- */
-
- public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) throws DgException{
+ return col;
+ }
+
+ /**
+ * Returns location using its id
+ *
+ * @param id of location
+ * @return AmpCategoryValueLocations bean
+ * @throws DgException if anything goes wrong
+ */
+
+ public static AmpCategoryValueLocations getAmpCategoryValueLocationById(Long id) throws DgException {
+ return (AmpCategoryValueLocations) PersistenceManager.getSession().load(AmpCategoryValueLocations.class, id);
+ }
+
+ /**
+ * Saves location into the database
+ *
+ * @param b
+ * @param AmpCategoryValueLocations bean
+ * @throws DgException
+ */
+
+ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing) throws DgException {
Session session = null;
Transaction tx = null;
- if (!editing){
-
+ if (!editing) {
+
/* country check for duplicate iso and iso3 codes */
boolean isCountry = CategoryConstants.IMPLEMENTATION_LOCATION_ADM_LEVEL_0.equalsCategoryValue(
loc.getParentCategoryValue());
@@ -174,14 +181,16 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing)
throw new DuplicateLocationCodeException("There is already a country with the same iso 3!", "iso3",
loc.getParentCategoryValue().getValue());
}
-
+
+ }
+
+ AmpCategoryValueLocations tempLoc =
+ DynLocationManagerUtil.getLocationByName(loc.getName(), loc.getParentCategoryValue(),
+ loc.getParentLocation());
+ if (tempLoc != null) {
+ throw new DuplicateLocationCodeException("There is already a location with the same name!",
+ "name", loc.getParentCategoryValue().getValue());
}
-
- AmpCategoryValueLocations tempLoc =
- DynLocationManagerUtil.getLocationByName(loc.getName(), loc.getParentCategoryValue(), loc.getParentLocation() );
- if ( tempLoc != null )
- throw new DuplicateLocationCodeException("There is already a location with the same name!", "name", loc.getParentCategoryValue().getValue() );
-
if (loc.getParentLocation() != null) {
if (loc.getParentLocation().getChildLocations() == null) {
loc.getParentLocation().setChildLocations(new HashSet());
@@ -189,7 +198,7 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing)
loc.getParentLocation().getChildLocations().add(loc);
}
}
-
+
try {
session = PersistenceManager.getRequestDBSession();
session.saveOrUpdate(loc);
@@ -197,17 +206,17 @@ public static void saveLocation(AmpCategoryValueLocations loc, boolean editing)
logger.error("Unable to save category value location into the database " + e.getMessage());
throw new DgException(e);
}
-
+
DynLocationManagerUtil.getOrCreateAmpLocationByCVL(loc);
}
-
+
public static class HelperLocationAncestorLocationNamesAsc implements Comparator {
- Locale locale;
- Collator collator;
+ private Locale locale;
+ private Collator collator;
- public HelperLocationAncestorLocationNamesAsc(){
- this.locale=new Locale("en", "EN");
+ public HelperLocationAncestorLocationNamesAsc() {
+ this.locale = new Locale("en", "EN");
}
public HelperLocationAncestorLocationNamesAsc(String iso) {
@@ -217,20 +226,20 @@ public HelperLocationAncestorLocationNamesAsc(String iso) {
public int compare(Location loc1, Location loc2) {
collator = Collator.getInstance(locale);
collator.setStrength(Collator.TERTIARY);
- List loca1AncestorLocationNames=loc1.getAncestorLocationNames();
- List loca2AncestorLocationNames=loc2.getAncestorLocationNames();
- if(loca1AncestorLocationNames==null||loca1AncestorLocationNames.isEmpty()){
+ List loca1AncestorLocationNames = loc1.getAncestorLocationNames();
+ List loca2AncestorLocationNames = loc2.getAncestorLocationNames();
+ if (loca1AncestorLocationNames == null || loca1AncestorLocationNames.isEmpty()) {
return -1;
}
- if(loca2AncestorLocationNames==null||loca2AncestorLocationNames.isEmpty()){
- return 1;
+ if (loca2AncestorLocationNames == null || loca2AncestorLocationNames.isEmpty()) {
+ return 1;
}
- StringBuilder location1FullName=new StringBuilder();
- for(String name:loca1AncestorLocationNames){
+ StringBuilder location1FullName = new StringBuilder();
+ for (String name : loca1AncestorLocationNames) {
location1FullName.append(name);
}
- StringBuilder location2FullName=new StringBuilder();
- for(String name:loca2AncestorLocationNames){
+ StringBuilder location2FullName = new StringBuilder();
+ for (String name : loca2AncestorLocationNames) {
location2FullName.append(name);
}
return collator.compare(location1FullName.toString(), location2FullName.toString());
@@ -245,7 +254,7 @@ public static int getIndicatorValuesCountByAmpLocation(AmpLocation ampLocation)
.add(Restrictions.eq("location", ampLocation))
.setProjection(Projections.rowCount())
.uniqueResult();
-
+
return indicatorValuesCount;
}
@@ -259,4 +268,25 @@ public static List getAllVisibleLocations() {
return criteria.list();
}
+
+ /**
+ * @return Country ids with children or all countries if showAllCountries == true
+ */
+ public static Collection getCountriesWithChildren(boolean pShowAllCountries) {
+
+ Session session = PersistenceManager.getSession();
+
+ String queryString = "SELECT loc FROM " + AmpCategoryValueLocations.class.getName()
+ + " loc WHERE loc.parentLocation IS NULL "
+ + " AND (loc.deleted != true)";
+ if (!pShowAllCountries) {
+ queryString += " AND (loc.id IN (SELECT DISTINCT parentLocation FROM "
+ + AmpCategoryValueLocations.class.getName() + " cloc where cloc.deleted != true))";
+ }
+
+ Query qry = session.createQuery(queryString);
+ qry.setCacheable(true);
+ Collection countryCollection = qry.list();
+ return countryCollection;
+ }
}
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java
index e575f104b38..3f81ae64916 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/LuceneUtil.java
@@ -901,6 +901,9 @@ public static Document activityToLuceneDocument(ActivityLuceneDocument actLucene
if (!valueTranslationsList.isEmpty()) {
for (AmpContentTranslation translation : valueTranslationsList) {
+ if (translation.getTranslation() == null) {
+ continue;
+ }
// Added try/catch because Field can throw an exception if any of the parameters is wrong and that would break the process.
try {
if ("name".equals(field)){
@@ -1041,41 +1044,41 @@ public static void addUpdateActivity(String rootRealPath, boolean update, Site s
IndexWriterConfig indexWriterConfig = new IndexWriterConfig(Version.LUCENE_36, LuceneUtil.ANALYZER);
indexWriterConfig.setWriteLockTimeout(LOCK_OBTAIN_WAIT_FOREVER);
Directory directory = FSDirectory.open(new File(rootRealPath + ACTIVITY_INDEX_DIRECTORY));
- IndexWriter indexWriter = new IndexWriter(directory, indexWriterConfig);
+ try (IndexWriter indexWriter = new IndexWriter(directory, indexWriterConfig)) {
- ArrayList componentsCode = new ArrayList();
- if(newActivity.getComponents() != null && Hibernate.isInitialized(newActivity.getComponents())){
- for (AmpComponent c : newActivity.getComponents()) {
- componentsCode.add(c.getCode());
+ ArrayList componentsCode = new ArrayList();
+ if (newActivity.getComponents() != null && Hibernate.isInitialized(newActivity.getComponents())) {
+ for (AmpComponent c : newActivity.getComponents()) {
+ componentsCode.add(c.getCode());
+ }
}
- }
-
- String language = navigationLanguage.getLanguage();
-
- ActivityLuceneDocument actLuceneDoc = new ActivityLuceneDocument();
- actLuceneDoc.setAmpActivityId(String.valueOf(newActivity.getAmpActivityId()));
- actLuceneDoc.setProjectId(projectid);
- actLuceneDoc.setName(String.valueOf(newActivity.getName()));
- actLuceneDoc.setDescription(DbUtil.getEditorBody(site, newActivity.getDescription(), language));
- actLuceneDoc.setObjective(DbUtil.getEditorBody(site, newActivity.getObjective(), language));
- actLuceneDoc.setPurpose(DbUtil.getEditorBody(site, newActivity.getPurpose(), language));
- actLuceneDoc.setResults(DbUtil.getEditorBody(site, newActivity.getResults(), language));
- actLuceneDoc.setContactName(DbUtil.getEditorBody(site, newActivity.getContactName(), language));
- actLuceneDoc.setCrisNumber(newActivity.getCrisNumber());
- actLuceneDoc.setBudgetCodeProjectId(newActivity.getBudgetCodeProjectID());
- actLuceneDoc.setBudgetCodes(LuceneUtil.getBudgetCodesForActivity(newActivity));
- actLuceneDoc.setComponentCodes(componentsCode);
- actLuceneDoc.setTranslations(translations);
-
- Document doc = activityToLuceneDocument(actLuceneDoc);
- if (doc != null) {
- try {
- indexWriter.addDocument(doc);
- indexWriter.optimize();
- indexWriter.close();
- } catch (Exception e) {
- e.printStackTrace();
+ String language = navigationLanguage.getLanguage();
+
+ ActivityLuceneDocument actLuceneDoc = new ActivityLuceneDocument();
+ actLuceneDoc.setAmpActivityId(String.valueOf(newActivity.getAmpActivityId()));
+ actLuceneDoc.setProjectId(projectid);
+ actLuceneDoc.setName(String.valueOf(newActivity.getName()));
+ actLuceneDoc.setDescription(DbUtil.getEditorBody(site, newActivity.getDescription(), language));
+ actLuceneDoc.setObjective(DbUtil.getEditorBody(site, newActivity.getObjective(), language));
+ actLuceneDoc.setPurpose(DbUtil.getEditorBody(site, newActivity.getPurpose(), language));
+ actLuceneDoc.setResults(DbUtil.getEditorBody(site, newActivity.getResults(), language));
+ actLuceneDoc.setContactName(DbUtil.getEditorBody(site, newActivity.getContactName(), language));
+ actLuceneDoc.setCrisNumber(newActivity.getCrisNumber());
+ actLuceneDoc.setBudgetCodeProjectId(newActivity.getBudgetCodeProjectID());
+ actLuceneDoc.setBudgetCodes(LuceneUtil.getBudgetCodesForActivity(newActivity));
+ actLuceneDoc.setComponentCodes(componentsCode);
+ actLuceneDoc.setTranslations(translations);
+
+ Document doc = activityToLuceneDocument(actLuceneDoc);
+
+ if (doc != null) {
+ try {
+ indexWriter.addDocument(doc);
+ indexWriter.optimize();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
} catch (Exception e) {
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java
index f264455ae49..10427466031 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/ProgramUtil.java
@@ -1506,6 +1506,27 @@ public static List getAmpActivityProgramSettingsList
return programSettings;
}
+ /**
+ * Returns a list of all enabled program settings. If no program settings are enabled, a default list is created.
+ * @return a list of all enabled program settings
+ */
+ public static List getEnabledProgramSettings() {
+ List programSettings = getAmpActivityProgramSettingsList(true);
+ if (programSettings.isEmpty()) {
+ programSettings = createDefaultAmpActivityProgramSettingsList();
+ }
+
+ Iterator iterator = programSettings.iterator();
+
+ while(iterator.hasNext()){
+ AmpActivityProgramSettings programSetting = iterator.next();
+ if(programSetting.getDefaultHierarchy() == null) {
+ iterator.remove();
+ }
+ }
+
+ return programSettings;
+ }
public static List createDefaultAmpActivityProgramSettingsList() {
Session session = PersistenceManager.getSession();
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java
index a3b5e298b02..772996db191 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/TeamMemberUtil.java
@@ -33,7 +33,6 @@
import org.digijava.kernel.util.UserUtils;
import org.digijava.module.aim.dbentity.AmpActivity;
import org.digijava.module.aim.dbentity.AmpActivityVersion;
-import org.digijava.module.aim.dbentity.AmpAnalyticalReport;
import org.digijava.module.aim.dbentity.AmpComments;
import org.digijava.module.aim.dbentity.AmpContact;
import org.digijava.module.aim.dbentity.AmpDesktopTabSelection;
@@ -1182,15 +1181,6 @@ public static void removeTeamMembers(Long id[]) {
session.saveOrUpdate(comm);
}
- qryStr = "select atr from " + AmpAnalyticalReport.class.getName() + " atr "
- + " where (atr.owner=:memberId) ";
- qry = session.createQuery(qryStr).setLong("memberId", amId);
- List ampAnalyticalReports = qry.list();
- if (ampAnalyticalReports != null && ampAnalyticalReports.size() > 0) {
- for (AmpAnalyticalReport ampAnRep : ampAnalyticalReports) {
- session.delete(ampAnRep);
- }
- }
qryStr = "delete AmpDesktopTabSelection dts where dts.owner=:memberId";
qry = session.createQuery(qryStr).setLong("memberId", amId);
qry.executeUpdate();
diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java b/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java
index ef6909b9f6e..b99d9d577d5 100644
--- a/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java
+++ b/amp/WEB-INF/src/org/digijava/module/aim/util/activity/ActivityCloser.java
@@ -18,6 +18,7 @@
import org.digijava.module.categorymanager.util.CategoryConstants;
import org.digijava.module.categorymanager.util.CategoryManagerUtil;
+import java.util.ArrayList;
import java.util.List;
import static org.digijava.module.aim.util.activity.GenericUserHelper.getAmpTeamMemberModifier;
@@ -89,6 +90,7 @@ public static AmpActivityVersion cloneActivity(AmpTeamMember member, AmpActivit
AmpActivityVersion auxActivity = null;
auxActivity = org.dgfoundation.amp.onepager.util.ActivityUtil.saveActivityNewVersion(oldActivity, null,
+ new ArrayList<>(),
member, oldActivity.getDraft(), PersistenceManager.getSession(), saveContext, editorStore, site);
java.util.Locale javaLocale = new java.util.Locale("en");
LuceneUtil.addUpdateActivity(AMPStartupListener.SERVLET_CONTEXT_ROOT_REAL_PATH, true,
diff --git a/amp/WEB-INF/src/org/digijava/module/contentrepository/helper/DocumentData.java b/amp/WEB-INF/src/org/digijava/module/contentrepository/helper/DocumentData.java
index fef7edcd6ed..409916a7a1f 100644
--- a/amp/WEB-INF/src/org/digijava/module/contentrepository/helper/DocumentData.java
+++ b/amp/WEB-INF/src/org/digijava/module/contentrepository/helper/DocumentData.java
@@ -507,36 +507,38 @@ public void setOrganisations(String generatedOrganisations)
*/
public static DocumentData buildFromNodeWrapper(NodeWrapper nodeWrapper, String uuid, String nodeVersionUUID) {
DocumentData documentData = new DocumentData();
- documentData.setName(nodeWrapper.getName());
- if (uuid != null) {
- documentData.setUuid(uuid);
- } else {
- documentData.setUuid(nodeWrapper.getUuid());
- }
- if (nodeVersionUUID != null) {
- documentData.setNodeVersionUUID(nodeVersionUUID);
+ if (nodeWrapper != null) {
+ documentData.setName(nodeWrapper.getName());
+ if (uuid != null) {
+ documentData.setUuid(uuid);
+ } else {
+ documentData.setUuid(nodeWrapper.getUuid());
+ }
+ if (nodeVersionUUID != null) {
+ documentData.setNodeVersionUUID(nodeVersionUUID);
+ }
+ documentData.setNodeVersionUUID(nodeWrapper.getUuid());
+ documentData.setTitle(nodeWrapper.getTitle());
+ documentData.setDescription(nodeWrapper.getDescription());
+ documentData.setNotes(nodeWrapper.getNotes());
+ documentData.setFileSize(nodeWrapper.getFileSizeInMegabytes());
+ documentData.setCalendar(nodeWrapper.getDate());
+ documentData.setVersionNumber(nodeWrapper.getVersionNumber());
+ documentData.setContentType(nodeWrapper.getContentType());
+ documentData.setWebLink(nodeWrapper.getWebLink());
+ documentData.setCmDocTypeId(nodeWrapper.getCmDocTypeId());
+ documentData.setYearofPublication(nodeWrapper.getYearOfPublication());
+ documentData.setLabels(nodeWrapper.getLabels());
+ documentData.setCreatorTeamId(nodeWrapper.getCreatorTeam());
+ documentData.setCreatorEmail(nodeWrapper.getCreator());
+ documentData.setIndex(nodeWrapper.getIndex());
+ documentData.setCategory(nodeWrapper.getCategory());
+ documentData.process();
+ documentData.computeIconPath(true);
+ documentData.setOrganisations(
+ DocumentOrganizationManager.getInstance().getOrganisationsAsStringByUUID(documentData.getUuid()));
+ documentData.setCreatorClient(nodeWrapper.getCreatorClient());
}
- documentData.setNodeVersionUUID(nodeWrapper.getUuid());
- documentData.setTitle(nodeWrapper.getTitle());
- documentData.setDescription(nodeWrapper.getDescription());
- documentData.setNotes(nodeWrapper.getNotes());
- documentData.setFileSize(nodeWrapper.getFileSizeInMegabytes());
- documentData.setCalendar(nodeWrapper.getDate());
- documentData.setVersionNumber(nodeWrapper.getVersionNumber());
- documentData.setContentType(nodeWrapper.getContentType());
- documentData.setWebLink(nodeWrapper.getWebLink());
- documentData.setCmDocTypeId(nodeWrapper.getCmDocTypeId());
- documentData.setYearofPublication(nodeWrapper.getYearOfPublication());
- documentData.setLabels(nodeWrapper.getLabels());
- documentData.setCreatorTeamId(nodeWrapper.getCreatorTeam());
- documentData.setCreatorEmail(nodeWrapper.getCreator());
- documentData.setIndex(nodeWrapper.getIndex());
- documentData.setCategory(nodeWrapper.getCategory());
- documentData.process();
- documentData.computeIconPath(true);
- documentData.setOrganisations(
- DocumentOrganizationManager.getInstance().getOrganisationsAsStringByUUID(documentData.getUuid()));
- documentData.setCreatorClient(nodeWrapper.getCreatorClient());
return documentData;
}
diff --git a/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java
new file mode 100644
index 00000000000..1033c72252e
--- /dev/null
+++ b/amp/WEB-INF/src/org/digijava/module/gateperm/gates/RelatedOrgExemptGate.java
@@ -0,0 +1,63 @@
+/**
+ *
+ */
+package org.digijava.module.gateperm.gates;
+
+import org.dgfoundation.amp.ar.MetaInfo;
+import org.digijava.kernel.user.User;
+import org.digijava.module.aim.helper.TeamMember;
+import org.digijava.module.aim.util.FeaturesUtil;
+import org.digijava.module.gateperm.core.Gate;
+import org.digijava.module.gateperm.core.GatePermConst;
+import org.digijava.module.gateperm.util.PermissionUtil;
+
+import static org.digijava.module.aim.helper.GlobalSettingsConstants.EXEMPT_ORGANIZATION_DOCUMENTS;
+
+/**
+ * Gives right if current user is assigned to an org that is related (by any role) to an object - such an activity
+ *
+ * @author mihai
+ */
+public class RelatedOrgExemptGate extends Gate {
+
+ public static final MetaInfo[] SCOPE_KEYS = new MetaInfo[]{GatePermConst.ScopeKeys.CURRENT_MEMBER};
+
+ public static final MetaInfo[] PARAM_INFO = null;
+
+ private static final String DESCRIPTION = "Gives right if current user is assigned to an org that is "
+ + "configured in Exempt organization to see documents global setting";
+
+ public RelatedOrgExemptGate() {
+
+ }
+
+ @Override
+ public String description() {
+ return DESCRIPTION;
+ }
+
+ @Override
+ public boolean logic() throws Exception {
+
+ TeamMember tm = (TeamMember) scope.get(GatePermConst.ScopeKeys.CURRENT_MEMBER);
+ if (tm == null) {
+ return false;
+ }
+
+ User user = PermissionUtil.getUser(scope, tm);
+
+
+ return user.hasVerifiedOrganizationId(FeaturesUtil.getGlobalSettingValueLong(EXEMPT_ORGANIZATION_DOCUMENTS));
+ }
+
+ @Override
+ public MetaInfo[] mandatoryScopeKeys() {
+ return SCOPE_KEYS;
+ }
+
+ @Override
+ public MetaInfo[] parameterInfo() {
+ return PARAM_INFO;
+ }
+
+}
diff --git a/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java b/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java
new file mode 100644
index 00000000000..7618b2b9cd9
--- /dev/null
+++ b/amp/WEB-INF/src/org/digijava/module/message/jobs/ChadActivityMigrationJob.java
@@ -0,0 +1,191 @@
+package org.digijava.module.message.jobs;
+
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpActivityLocation;
+import org.digijava.module.aim.dbentity.AmpActivityVersion;
+import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
+import org.digijava.module.categorymanager.dbentity.AmpCategoryValue;
+import org.digijava.module.categorymanager.util.CategoryConstants;
+import org.digijava.module.categorymanager.util.CategoryManagerUtil;
+import org.hibernate.type.LongType;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.StatefulJob;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Only for Chad.
+ *
+ * ADM-3 level was removed completely. All activities linked to ADM-3 will be updated to point to their corresponding
+ * parent locations at ADM-2 level.
+ * Special case only for N'Djamena (ADM-2): ADM-3 locations are now ADM-2 locations.
+ * Eg: '1er Arrondissement' (ADM-3) is now '1er Arrondissement' (ADM-2). The entity ids are different though.
+ *
+ * Script to add job:
+ * INSERT INTO amp_quartz_job_class (jc_id,jc_name, jc_class_fullname) VALUES
+ * (nextval('amp_quartz_job_class_seq'),
+ * 'Migrate Chad activities to new locations',
+ * 'org.digijava.module.message.jobs.ChadActivityMigrationJob');
+ *
+ * Script to delete the job:
+ * delete from amp_quartz_job_class
+ * where jc_class_fullname='org.digijava.module.message.jobs.ChadActivityMigrationJob';
+ */
+public class ChadActivityMigrationJob extends ConnectionCleaningJob implements StatefulJob {
+
+ private static final int LEVEL_3 = 3;
+
+ private final Logger logger = LoggerFactory.getLogger(ChadActivityMigrationJob.class);
+
+ @Override
+ public void executeInternal(JobExecutionContext context) throws JobExecutionException {
+ logger.info("Migrating Chad activities to new administrative boundaries");
+
+ updateActivityLocations();
+
+ deleteSubPrefectures();
+
+ logger.info("Finished migrating Chad activities to new administrative boundaries");
+ }
+
+ private void deleteSubPrefectures() {
+ PersistenceManager.getSession()
+ .createSQLQuery("update amp_category_value_location\n"
+ + "set deleted=true\n"
+ + "where location_name='N''DJAMENA' and id=9612\n")
+ .executeUpdate();
+
+ PersistenceManager.getSession()
+ .createSQLQuery("update amp_category_value_location adm3\n"
+ + "set deleted=true\n"
+ + "from amp_category_value_location adm0\n"
+ + "join amp_category_value_location adm1 on adm1.parent_location=adm0.id\n"
+ + "join amp_category_value_location adm2 on adm2.parent_location=adm1.id\n"
+ + "where adm3.parent_location=adm2.id")
+ .executeUpdate();
+ }
+
+ private void updateActivityLocations() {
+ AmpCategoryValue zoneLocation = getCV(CategoryConstants.IMPLEMENTATION_LOCATION_KEY,
+ "Administrative Level 2", "Failed to find ADM2 implementation location");
+
+ AmpCategoryValue zoneLevel = getCV(CategoryConstants.IMPLEMENTATION_LEVEL_KEY,
+ "Zone", "Failed to find Zone implementation level");
+
+ AmpCategoryValue regionLocation = getCV(CategoryConstants.IMPLEMENTATION_LOCATION_KEY,
+ "Administrative Level 1", "Failed to find ADM1 implementation location");
+
+ AmpCategoryValue regionLevel = getCV(CategoryConstants.IMPLEMENTATION_LEVEL_KEY,
+ "Provincial", "Failed to find Provincial implementation level");
+
+ for (Long activityId : getADM3ActivityIds()) {
+ updateActivity(activityId, zoneLocation, zoneLevel);
+ }
+
+ for (Long activityId : getADM2NdjamenaActivityIds()) {
+ updateActivity(activityId, regionLocation, regionLevel);
+ }
+ }
+
+ private void updateActivity(Long activityId,
+ AmpCategoryValue zoneLocation, AmpCategoryValue zoneLevel) {
+
+ AmpActivityVersion activity = (AmpActivityVersion) PersistenceManager.getSession()
+ .load(AmpActivityVersion.class, activityId);
+
+ activity.getCategories().removeIf(cv ->
+ cv.getAmpCategoryClass().getKeyName().equals(CategoryConstants.IMPLEMENTATION_LOCATION_KEY)
+ || cv.getAmpCategoryClass().getKeyName().equals(CategoryConstants.IMPLEMENTATION_LEVEL_KEY));
+
+ activity.getCategories().add(zoneLocation);
+ activity.getCategories().add(zoneLevel);
+
+ List newActivityLocations = new ArrayList<>();
+
+ for (AmpActivityLocation activityLocation : activity.getLocations()) {
+
+ AmpCategoryValueLocations location = activityLocation.getLocation();
+
+ AmpCategoryValueLocations newLocation = getNewLocation(location);
+
+ AmpActivityLocation newActivityLocation = newActivityLocations.stream()
+ .filter(al -> al.getLocation().equals(newLocation))
+ .findFirst()
+ .orElseGet(() -> new AmpActivityLocation(activityLocation.getActivity(), newLocation,
+ 0f, activityLocation.getLatitude(), activityLocation.getLongitude()));
+
+ if (activityLocation.getLocationPercentage() != null) {
+ newActivityLocation.setLocationPercentage(
+ newActivityLocation.getLocationPercentage() + activityLocation.getLocationPercentage());
+ }
+
+ newActivityLocations.add(newActivityLocation);
+ }
+
+ activity.getLocations().clear();
+ activity.getLocations().addAll(newActivityLocations);
+ }
+
+ private AmpCategoryValueLocations getNewLocation(AmpCategoryValueLocations loc) {
+ AmpCategoryValueLocations parentLocation = loc.getParentLocation();
+ if (parentLocation.getName().equals("N'DJAMENA") && getAdmLevel(loc) == LEVEL_3) {
+ return (AmpCategoryValueLocations) PersistenceManager.getSession().createQuery(
+ "from AmpCategoryValueLocations\n"
+ + "where name=:name\n"
+ + "and id<>:oldId")
+ .setString("name", loc.getName())
+ .setLong("oldId", loc.getId())
+ .uniqueResult();
+ } else {
+ return parentLocation;
+ }
+ }
+
+ private int getAdmLevel(AmpCategoryValueLocations loc) {
+ int level = 0;
+ while (loc.getParentLocation() != null) {
+ loc = loc.getParentLocation();
+ level++;
+ }
+ return level;
+ }
+
+ private AmpCategoryValue getCV(String implementationLocationKey, String o, String s) {
+ return CategoryManagerUtil.getAmpCategoryValueCollectionByKey(implementationLocationKey)
+ .stream()
+ .filter(cv -> cv.getValue().equals(o))
+ .findFirst()
+ .orElseThrow(() -> new RuntimeException(s));
+ }
+
+ private List getADM3ActivityIds() {
+ return PersistenceManager.getSession().createSQLQuery(
+ "select distinct a.amp_activity_id\n"
+ + "from amp_activity a\n"
+ + " join amp_activity_location al on a.amp_activity_id=al.amp_activity_id\n"
+ + " join amp_category_value_location cvl on al.location_id = cvl.id\n"
+ + " join amp_category_value_location cvlp on cvl.parent_location=cvlp.id\n"
+ + " join amp_category_value_location cvlp2 on cvlp.parent_location=cvlp2.id\n"
+ + " join amp_category_value_location cvlp3 on cvlp2.parent_location=cvlp3.id\n"
+ + "where cvlp3.parent_location is null")
+ .addScalar("amp_activity_id", LongType.INSTANCE)
+ .list();
+ }
+
+ private List getADM2NdjamenaActivityIds() {
+ return PersistenceManager.getSession().createSQLQuery(
+ "select distinct a.amp_activity_id\n"
+ + "from amp_activity a\n"
+ + "join amp_activity_location al on a.amp_activity_id=al.amp_activity_id\n"
+ + "join amp_category_value_location cvl_adm2 on al.location_id = cvl_adm2.id\n"
+ + "join amp_category_value_location cvl_adm1 on cvl_adm2.parent_location = cvl_adm1.id\n"
+ + "join amp_category_value_location cvl_adm0 on cvl_adm1.parent_location = cvl_adm0.id\n"
+ + "where cvl_adm2.location_name='N''DJAMENA' and cvl_adm0.parent_location is null")
+ .addScalar("amp_activity_id", LongType.INSTANCE)
+ .list();
+ }
+}
diff --git a/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java b/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java
index 1e4110a089d..53eecbbb243 100644
--- a/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java
+++ b/amp/WEB-INF/src/org/digijava/module/translation/util/ContentTranslationUtil.java
@@ -112,15 +112,16 @@ public static boolean translateObject(Object obj, Serializable id, Object[] stat
*
* @return the identifier for the object in the TranslationStore
*/
- private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, String fieldName, String currentLocale, String fieldTrnCurrentLocale, List formFieldTrns){
+ private static Long getFieldTrnPack(Class clazz, Long objId, String fieldName,
+ String currentLocale, String fieldTrnCurrentLocale, List formFieldTrns,
+ List cumulativeTranslations) {
+ String objClass = clazz.getName();
//get old translations for current field
List currentTranslations = loadFieldTranslations(objClass, objId, fieldName);
//create the FieldTranslationPack object
FieldTranslationPack trnPack = new FieldTranslationPack(objClass, fieldName);
- if (currentTranslations != null){ //if we have trns from the db, add them to the list
- for (AmpContentTranslation ampContentTranslation : currentTranslations) {
- trnPack.add(ampContentTranslation);
- }
+ for (AmpContentTranslation ampContentTranslation : currentTranslations) {
+ trnPack.add(ampContentTranslation);
}
if (formFieldTrns != null){//override the translations from the db with the ones from the form if available
@@ -139,6 +140,9 @@ private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, St
trnPack.add(getBaseLanguage(), baseTrn);
}
+ trnPack.getTranslations().forEach((locale, value) ->
+ cumulativeTranslations.add(new AmpContentTranslation(objClass, objId, fieldName, locale, value)));
+
return TranslationStore.insert(trnPack);
}
@@ -149,7 +153,7 @@ private static Long getFieldTrnPack(Class clazz, String objClass, Long objId, St
* @param obj Object that needs translation cloning
*/
public static void cloneTranslations(Object obj){
- cloneTranslations(obj, null);
+ cloneTranslations(obj, null, new ArrayList<>());
}
/**
@@ -201,12 +205,12 @@ public static boolean multilingualIsEnabled()
* @param formTranslations the list of translations that were modified using the activity form
*/
@SuppressWarnings("unchecked")
- public static void cloneTranslations(Object obj, Collection formTranslations)
- {
+ public static void cloneTranslations(Object obj, Collection formTranslations,
+ List cumulativeTranslations) {
//check if multilingual is enabled
if (!multilingualIsEnabled())
return;
- cloneTranslations(obj, formTranslations, new HashSet());
+ cloneTranslations(obj, formTranslations, cumulativeTranslations, new HashSet());
}
/**
@@ -218,7 +222,8 @@ public static void cloneTranslations(Object obj, Collection formTranslations, Set processed){
+ private static void cloneTranslations(Object obj, Collection formTranslations,
+ List cumulativeTranslations, Set processed) {
Hibernate.initialize(obj);
String objClass = getObjectClassName(obj);
Long objId = getObjectId(obj);
@@ -259,7 +264,8 @@ private static void cloneTranslations(Object obj, Collectionorg.hamcrest
hamcrest-core
1.3
- test
org.unitils
@@ -1199,7 +1198,7 @@
-
+
com.github.eirslett
frontend-maven-plugin
@@ -1208,277 +1207,229 @@
v16.4.0
-
-
install node and npm for GIS
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev
-
install node and npm for Dashboards
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev
-
-
install node and npm for amp-state
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-state
-
- npm install for amp-state
+ npm ci for amp-state
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-state
-
-
install node and npm for amp-translate
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-translate
-
- npm install for amp-translate
+ npm ci for amp-translate
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-translate
-
-
install node and npm for amp-boilerplate
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
-
- npm install for amp-boilerplate
+ npm ci for amp-boilerplate
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
-
- gulp build for amp-boilerplate
+ npm run build for amp-boilerplate
- gulp
+ npm
process-resources
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
-
-
install node and npm for amp-filter
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter
-
- npm install for amp-filter
+ npm ci for amp-filter
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter
-
- gulp build for amp-filter
+ npm run build for amp-filter
- gulp
+ npm
process-resources
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-filter
-
-
install node and npm for gis-layers-manager
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager
-
- npm install for gis-layers-manager
+ npm ci for gis-layers-manager
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager
-
- gulp build for gis-layers-manager
+ npm run build for gis-layers-manager
- gulp
+ npm
process-resources
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/node_modules/gis-layers-manager
-
-
install node and npm for amp-settings
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings
-
- npm install for amp-settings
+ npm ci for amp-settings
npm
-
process-resources
ci
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings
-
- gulp build for amp-settings
+ npm run build for amp-settings
- gulp
+ npm
process-resources
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/node_modules/amp-settings
-
- npm install for GIS
+ npm ci for GIS
npm
-
process-resources
-
ci
${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev
-
- gulp build for GIS
+ npm run build for GIS
- gulp
+ npm
-
process-resources
-
-
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev
- gulp test for GIS
+ npm run test for GIS
- gulp
+ npm
test
- test
+ run test
${project.basedir}/TEMPLATE/ampTemplate/gisModule/dev
-
install node and npm for reampv2
@@ -1490,7 +1441,7 @@
- npm install for reampv2
+ npm ci for reampv2
npm
@@ -1512,26 +1463,22 @@
-
install node and npm for reamp
install-node-and-npm
-
process-resources
${project.basedir}/TEMPLATE/reamp
- npm install for reamp
+ npm ci for reamp
npm
-
process-resources
-
ci
${project.basedir}/TEMPLATE/reamp
@@ -1547,32 +1494,25 @@
${project.basedir}/TEMPLATE/reamp
-
- npm install for Dashboards
+ npm ci for Dashboards
npm
-
process-resources
-
ci
${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev
- gulp build for Dashboards
+ npm run build for Dashboards
- gulp
+ npm
-
process-resources
-
-
- build
+ run build
${project.basedir}/TEMPLATE/ampTemplate/dashboard/dev
@@ -1731,7 +1671,6 @@
install-node-and-npm
npm
- gulp
diff --git a/amp/repository/aim/module-config.xml b/amp/repository/aim/module-config.xml
index d0fa6f972f4..1e353866729 100644
--- a/amp/repository/aim/module-config.xml
+++ b/amp/repository/aim/module-config.xml
@@ -233,9 +233,6 @@
org.digijava.module.aim.dbentity.GPISetup
org.digijava.module.aim.dbentity.GPIDefaultFilters
-
- org.digijava.module.aim.dbentity.AmpAnalyticalReport
-
org.digijava.module.aim.dbentity.AmpAidEffectivenessIndicator
org.digijava.module.aim.dbentity.AmpAidEffectivenessIndicatorOption
diff --git a/amp/repository/aim/view/addressBookPrintPreview.jsp b/amp/repository/aim/view/addressBookPrintPreview.jsp
index 2d88e9d59c6..e3788df46a7 100644
--- a/amp/repository/aim/view/addressBookPrintPreview.jsp
+++ b/amp/repository/aim/view/addressBookPrintPreview.jsp
@@ -72,7 +72,7 @@
- ${prop.actualPhoneNumber}
+ ${prop.value}
diff --git a/amp/repository/aim/view/allVisibilityTags.jsp b/amp/repository/aim/view/allVisibilityTags.jsp
index d6166d3c456..7bf0ec33a5d 100644
--- a/amp/repository/aim/view/allVisibilityTags.jsp
+++ b/amp/repository/aim/view/allVisibilityTags.jsp
@@ -723,7 +723,8 @@ deleted 6 fields, do not reinsert
-
+
+
diff --git a/amp/repository/aim/view/changePassword.jsp b/amp/repository/aim/view/changePassword.jsp
index 4e00ad1d53c..4d3fa2bd362 100644
--- a/amp/repository/aim/view/changePassword.jsp
+++ b/amp/repository/aim/view/changePassword.jsp
@@ -1,3 +1,5 @@
+<%@ page import="org.digijava.module.aim.util.TeamUtil" %>
+<%@ page import="org.digijava.module.aim.util.TeamMemberUtil" %>
<%@ page pageEncoding="UTF-8" %>
<%@ taglib uri="/taglib/struts-bean" prefix="bean" %>
<%@ taglib uri="/taglib/struts-logic" prefix="logic" %>
@@ -55,13 +57,32 @@ function validate(){
Change Password
-
+
+
+
+
+
+ You are signing-in to one or more secure applications for
+ official business.
+ You have been granted the right to access these
+ applications and the information contained in them to facilitate
+ your official business. Your accounts and passwords are your
+ responsibility. Do not share them with anyone.
+
+
+
+
+
+
+
+
+
-
+
@@ -71,20 +92,29 @@ function validate(){
-
-
+
+
-
+
-
+
*
- UserId
+ User ID
-
+
+
+
+
+
+
+
+
+
+
e.g. yourname@emailaddress.com
@@ -92,7 +122,7 @@ function validate(){
-
+
@@ -102,9 +132,9 @@ function validate(){
-
+
-
+
* New Password
@@ -116,11 +146,11 @@ function validate(){
-
+
- * Confirm new
+ * Confirm New
Password
@@ -128,13 +158,13 @@ function validate(){
-
+
-
-
+
Submit
+
@@ -145,34 +175,73 @@ function validate(){
-
-
-
-
-
-
-
-
-
- You are signing-in to one or more secure applications for
- official business. You have been granted the right to access these
- applications and the information contained in them to facilitate
- your official business. Your accounts and passwords are your
- responsibility. Do not share them with anyone.
-
-
-
-
-
-
-
-
-
-
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- You are signing-in to one or more secure applications for--%>
+<%-- official business. You have been granted the right to access these--%>
+<%-- applications and the information contained in them to facilitate--%>
+<%-- your official business. Your accounts and passwords are your--%>
+<%-- responsibility. Do not share them with anyone.--%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%-- --%>
+<%--
--%>
+<%-- --%>
+
+<%-- --%>
diff --git a/amp/repository/aim/view/components/addContactPopin.jsp b/amp/repository/aim/view/components/addContactPopin.jsp
index 27a4d9454fa..b5e11c6da9f 100644
--- a/amp/repository/aim/view/components/addContactPopin.jsp
+++ b/amp/repository/aim/view/components/addContactPopin.jsp
@@ -133,11 +133,11 @@
-
- ${phone.phoneCategory} ${fn:substring(phone.actualPhoneNumber,0,10)}...
+
+ ${phone.phoneCategory} ${fn:substring(phone.value,0,10)}...
-
+
diff --git a/amp/repository/aim/view/editOrganisation.jsp b/amp/repository/aim/view/editOrganisation.jsp
index cb029c7e627..0f69e71748e 100644
--- a/amp/repository/aim/view/editOrganisation.jsp
+++ b/amp/repository/aim/view/editOrganisation.jsp
@@ -1979,11 +1979,13 @@ border-right: 1px solid rgb(208, 208, 208);
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/amp/repository/aim/view/editOrganisationFromWorkspace.jsp b/amp/repository/aim/view/editOrganisationFromWorkspace.jsp
index 2938c56bc74..4b3c53c5d9b 100644
--- a/amp/repository/aim/view/editOrganisationFromWorkspace.jsp
+++ b/amp/repository/aim/view/editOrganisationFromWorkspace.jsp
@@ -985,7 +985,7 @@ initContactScript();
-
+
diff --git a/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js b/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js
index a9ff0202285..ddce134745f 100644
--- a/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js
+++ b/amp/repository/aim/view/scripts/reportWizard/filterWidgetLoader.js
@@ -26,7 +26,6 @@ $(document).ready(function () {
reportTypeCode = PLEDGE_TYPE;
}
var advancedFilters = (document.URL.indexOf('queryEngine.do') > -1);
- var isWorkspaceEditor = (document.URL.indexOf('Workspace.do') > -1);
var embedded = advancedFilters;
widgetFilter = new ampFilter({
el: container,
@@ -60,33 +59,30 @@ $(document).ready(function () {
// Save just applied filters in case the user hits "reset" button.
$('#queryLabelsDiv').html('');
var serializedFilters = widgetFilter.serialize() || {};
- if (isWorkspaceEditor) {
- repFilters.populateSelectedFilters('#listFiltersDiv', widgetFilter);
+ var url = '/aim/reportsFilterPicker.do?apply=true&cacheBuster=';
+ if (advancedFilters) {
+ showSpinner();
+ url += new Date().getTime() + '&reportContextId=' + widgetFilter.auxId + '&doreset=true&queryEngine=true';
} else {
- var url = '/aim/reportsFilterPicker.do?apply=true&cacheBuster=';
- if (advancedFilters) {
- showSpinner();
- url += new Date().getTime() + '&reportContextId=' + widgetFilter.auxId + '&doreset=true&queryEngine=true';
- } else {
- url += new Date().getTime() + '&reportContextId=' + widgetFilter.reportContextId +
- '&sourceIsReportWizard=true';
- }
- $.ajax({
- type: 'POST',
- url: url,
- data: "filtersWidget=" + JSON.stringify(serializedFilters),
- success: function (data) {
- if (!embedded) {
- $('#listFiltersDiv').html(data);
- $('#hasFilters').val(true);
- } else {
- $('#queryLabelsDiv').html(data);
- // document.getElementById('queryLabelsDiv').scrollIntoView();
- hideSpinner();
- }
- }
- });
+ url += new Date().getTime() + '&reportContextId=' + widgetFilter.reportContextId +
+ '&sourceIsReportWizard=true';
}
+ $.ajax({
+ type: 'POST',
+ url: url,
+ data: "filtersWidget=" + JSON.stringify(serializedFilters),
+ success: function (data) {
+ if (!embedded) {
+ $('#listFiltersDiv').html(data);
+ repFilters.populateSelectedFilters('#listFiltersDiv', widgetFilter);
+ $('#hasFilters').val(true);
+ } else {
+ $('#queryLabelsDiv').html(data);
+ // document.getElementById('queryLabelsDiv').scrollIntoView();
+ hideSpinner();
+ }
+ }
+ });
if (!embedded) {
$(container).hide();
$('#useFiltersCheckbox').attr('checked', 'checked');
diff --git a/amp/repository/aim/view/updateWorkspace.jsp b/amp/repository/aim/view/updateWorkspace.jsp
index 39bd4592b93..1aeab2a4069 100644
--- a/amp/repository/aim/view/updateWorkspace.jsp
+++ b/amp/repository/aim/view/updateWorkspace.jsp
@@ -442,8 +442,11 @@
}
if (document.aimUpdateWorkspaceForm.computation.checked == true) {
var selectedOrganizations = $('[name="selectedOrgId"]');
+ var useFilter = $("input[name='useFilter'][value='true']:radio")[0].checked;
var hasFilters = $.parseJSON(document.aimUpdateWorkspaceForm.hasFilters.value);
- if (!hasFilters && selectedOrganizations.length <= 0) {
+ if ((useFilter && !hasFilters) ||
+ (!useFilter && selectedOrganizations.length === 0)) {
+
alert("Please add a filter or a children organization ");
document.aimUpdateWorkspaceForm.computation.focus();
return false;
diff --git a/amp/repository/aim/view/userRegistration.jsp b/amp/repository/aim/view/userRegistration.jsp
index a4f16778ff5..db5be4112f6 100644
--- a/amp/repository/aim/view/userRegistration.jsp
+++ b/amp/repository/aim/view/userRegistration.jsp
@@ -12,373 +12,396 @@
- function optionChanged(flag) {
- if (flag == 'otype') {
- var index1 = document.aimUserRegisterForm.selectedOrgType.selectedIndex;
- var val1 = document.aimUserRegisterForm.selectedOrgType.options[index1].value;
- var orgType = document.aimUserRegisterForm.orgType.value;
- if ( val1 != "-1") {
- if (val1 != orgType) {
- document.aimUserRegisterForm.orgType.value = val1;
- document.aimUserRegisterForm.actionFlag.value = "typeSelected";
-
- document.aimUserRegisterForm.action = "<%= selectType %>";
- document.aimUserRegisterForm.target = "_self";
- document.aimUserRegisterForm.submit();
- }
- return false;
- }
- else
- return false;
- }
- if (flag == 'ogroup') {
- var index2 = document.aimUserRegisterForm.selectedOrgGroup.selectedIndex;
- var val2 = document.aimUserRegisterForm.selectedOrgGroup.options[index2].value;
- var orgGrp = document.aimUserRegisterForm.orgGrp.value;
- if ( val2 != "-1") {
- if (val2 != orgGrp) {
- document.aimUserRegisterForm.orgGrp.value = val2;
- document.aimUserRegisterForm.actionFlag.value = "groupSelected";
-
- document.aimUserRegisterForm.action = "<%= selectGrp %>";
- document.aimUserRegisterForm.target = "_self";
- document.aimUserRegisterForm.submit();
- }
- return false;
- }
- else
- return false;
- }
- }
-
- function isVoid(name){
- if (name == "" || name == null || name.charAt(0) == ' '){
- return 1;
- }
- if (!isNaN(name)){
- return 2;
- }
- return 0;
- }
-
- function validate(){
- name = document.aimUserRegisterForm.firstNames.value;
- lastname = document.aimUserRegisterForm.lastName.value;
- password = document.aimUserRegisterForm.password.value;
- passwordConfirmation = document.aimUserRegisterForm.passwordConfirmation.value;
- selectedOrgType = document.aimUserRegisterForm.selectedOrgType.value;
- selectedOrgGroup = document.aimUserRegisterForm.selectedOrgGroup.value;
- selectedOrganizationId = document.aimUserRegisterForm.selectedOrganizationId.value;
-
- if (isVoid(name)==1)
- {
-
- First Name is Blank
-
- alert("${translation}");
- return false;
+ function optionChanged(flag) {
+ if (flag == 'otype') {
+ var index1 = document.aimUserRegisterForm.selectedOrgType.selectedIndex;
+ var val1 = document.aimUserRegisterForm.selectedOrgType.options[index1].value;
+ var orgType = document.aimUserRegisterForm.orgType.value;
+ if ( val1 != "-1") {
+ if (val1 != orgType) {
+ document.aimUserRegisterForm.orgType.value = val1;
+ document.aimUserRegisterForm.actionFlag.value = "typeSelected";
+
+ document.aimUserRegisterForm.action = "<%= selectType %>";
+ document.aimUserRegisterForm.target = "_self";
+ document.aimUserRegisterForm.submit();
}
- if (isVoid(name)==2)
- {
-
- First Name can't be only numeric
-
- alert("${translation}");
- return false;
- }
- if (isVoid(lastname)==1)
- {
-
- Last Name is Blank
-
- alert("${translation}");
- return false;
- }
- if (isVoid(lastname)==2)
- {
-
- LastName can't be only numeric
-
- alert("${translation}");
- return false;
- }
- if(validateEmail()==false)
- return false
- if (isVoid(password)||isVoid(passwordConfirmation))
- {
-
- Please use at least one letter in the password field.
-
- alert("${translation}");
- return false;
- }
- if(password != passwordConfirmation){
-
- Passwords in both fields must be the same
-
- alert("${translation}");
- return false;
- }
-
- if(selectedOrgType=="-1"){
-
- Please enter Organization Type
-
- alert("${translation}");
- return false;
- }
- if(selectedOrgGroup=="-1"){
-
- Please Select Organization Group
-
- alert("${translation}");
- return false;
- }
- if(selectedOrganizationId=="-1"){
-
- Please Select Organization
-
- alert("${translation}");
- return false;
+ return false;
+ }
+ else
+ return false;
+ }
+ if (flag == 'ogroup') {
+ var index2 = document.aimUserRegisterForm.selectedOrgGroup.selectedIndex;
+ var val2 = document.aimUserRegisterForm.selectedOrgGroup.options[index2].value;
+ var orgGrp = document.aimUserRegisterForm.orgGrp.value;
+ if ( val2 != "-1") {
+ if (val2 != orgGrp) {
+ document.aimUserRegisterForm.orgGrp.value = val2;
+ document.aimUserRegisterForm.actionFlag.value = "groupSelected";
+
+ document.aimUserRegisterForm.action = "<%= selectGrp %>";
+ document.aimUserRegisterForm.target = "_self";
+ document.aimUserRegisterForm.submit();
}
+ return false;
+ }
+ else
+ return false;
+ }
+ }
- return true;
- }
-
- function validateEmail() {
- var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
- var address = document.aimUserRegisterForm.email.value;
- var address2 = document.aimUserRegisterForm.emailConfirmation.value;
- if(reg.test(address) == false||reg.test(address2) == false) {
-
- Please enter a valid email address.
-
- alert("${translation}");
- return false;
- }
- if(address != address2){
-
- Emails in both fields must be the same
-
- alert("${translation}");
- return false;
- }
-
- var notificationEmail = $('#notificationEmail').val();
- if ($('#notificationEmailEnabled').is(":checked")) {
- if(reg.test(notificationEmail) == false) {
- Please enter a valid Notification Email
- alert("${translation}");
- return false;
- }
-
- if(address == notificationEmail) {
- Email address and notification email address must be different
- alert("${translation}");
- return false;
- }
- }
-
- return true;
- }
-
- function resetFields () {
- var list = document.getElementsByTagName('input');
- for(var i = 0; i < list.length; i++) {
- if(list[i].type == 'text' || list[i].type == 'password')
- {
- list[i].value = '';
- }
- }
- document.getElementsByName("selectedOrgType")[0].selectedIndex = 0;
- document.getElementsByName("selectedOrgGroup")[0].selectedIndex = 0;
- document.getElementsByName("selectedOrganizationId")[0].selectedIndex = 0;
-
- $('#notificationEmailEnabled').prop('checked', false);
- $('#notificationEmailRow').hide();
- }
-
- function init() {
- $('#notificationEmailEnabled').bind("click", function() {
- $('#notificationEmailRow') [this.checked ? "show" : "hide"]();
- });
-
- $('#notificationEmailRow')[$('#notificationEmailEnabled').is(":checked") ? "show" : "hide"]();
- }
-
-
- var enterBinder = new EnterHitBinder('registerUserBtn');
-
- YAHOOAmp.util.Event.addListener(window, "load", init);
+ function isVoid(name){
+ if (name == "" || name == null || name.charAt(0) == ' '){
+ return 1;
+ }
+ if (!isNaN(name)){
+ return 2;
+ }
+ return 0;
+ }
+
+ function validate(){
+ name = document.aimUserRegisterForm.firstNames.value;
+ lastname = document.aimUserRegisterForm.lastName.value;
+ password = document.aimUserRegisterForm.password.value;
+ passwordConfirmation = document.aimUserRegisterForm.passwordConfirmation.value;
+ selectedOrgType = document.aimUserRegisterForm.selectedOrgType.value;
+ selectedOrgGroup = document.aimUserRegisterForm.selectedOrgGroup.value;
+ selectedOrganizationId = document.aimUserRegisterForm.selectedOrganizationId.value;
+
+ if (isVoid(name)==1)
+ {
+
+ First Name is Blank
+
+ alert("${translation}");
+ return false;
+ }
+ if (isVoid(name)==2)
+ {
+
+ First Name can't be only numeric
+
+ alert("${translation}");
+ return false;
+ }
+ if (isVoid(lastname)==1)
+ {
+
+ Last Name is Blank
+
+ alert("${translation}");
+ return false;
+ }
+ if (isVoid(lastname)==2)
+ {
+
+ LastName can't be only numeric
+
+ alert("${translation}");
+ return false;
+ }
+ if(validateEmail()==false)
+ return false
+ if (isVoid(password)||isVoid(passwordConfirmation))
+ {
+
+ Please use at least one letter in the password field.
+
+ alert("${translation}");
+ return false;
+ }
+ if(password != passwordConfirmation){
+
+ Passwords in both fields must be the same
+
+ alert("${translation}");
+ return false;
+ }
+
+ if(selectedOrgType=="-1"){
+
+ Please enter Organization Type
+
+ alert("${translation}");
+ return false;
+ }
+ if(selectedOrgGroup=="-1"){
+
+ Please Select Organization Group
+
+ alert("${translation}");
+ return false;
+ }
+ if(selectedOrganizationId=="-1"){
+
+ Please Select Organization
+
+ alert("${translation}");
+ return false;
+ }
+
+ return true;
+ }
+
+ function validateEmail() {
+ var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+ var address = document.aimUserRegisterForm.email.value;
+ var address2 = document.aimUserRegisterForm.emailConfirmation.value;
+ if(reg.test(address) == false||reg.test(address2) == false) {
+
+ Please enter a valid email address.
+
+ alert("${translation}");
+ return false;
+ }
+ if(address != address2){
+
+ Emails in both fields must be the same
+
+ alert("${translation}");
+ return false;
+ }
+
+ var notificationEmail = $('#notificationEmail').val();
+ if ($('#notificationEmailEnabled').is(":checked")) {
+ if(reg.test(notificationEmail) == false) {
+ Please enter a valid Notification Email
+ alert("${translation}");
+ return false;
+ }
+
+ if(address == notificationEmail) {
+ Email address and notification email address must be different
+ alert("${translation}");
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function resetFields () {
+ var list = document.getElementsByTagName('input');
+ for(var i = 0; i < list.length; i++) {
+ if(list[i].type == 'text' || list[i].type == 'password')
+ {
+ list[i].value = '';
+ }
+ }
+ document.getElementsByName("selectedOrgType")[0].selectedIndex = 0;
+ document.getElementsByName("selectedOrgGroup")[0].selectedIndex = 0;
+ document.getElementsByName("selectedOrganizationId")[0].selectedIndex = 0;
+
+ $('#notificationEmailEnabled').prop('checked', false);
+ $('#notificationEmailRow').hide();
+ }
+
+ function init() {
+ $('#notificationEmailEnabled').bind("click", function() {
+ $('#notificationEmailRow') [this.checked ? "show" : "hide"]();
+ });
+
+ $('#notificationEmailRow')[$('#notificationEmailEnabled').is(":checked") ? "show" : "hide"]();
+ }
+
+
+ var enterBinder = new EnterHitBinder('registerUserBtn');
+
+ YAHOOAmp.util.Event.addListener(window, "load", init);
-Please select this checkbox in case you want to specify an email address to receive system notifications.
-This email address will potentially be used by the system to send AMP related information.
-If you are unsure now, an AMP admin can add your Notification Email later on.
-Please do not attempt to use the Notification Email as user login.
+ Please select this checkbox in case you want to specify an email address to receive system notifications.
+ This email address will potentially be used by the system to send AMP related information.
+ If you are unsure now, an AMP admin can add your Notification Email later on.
+ Please do not attempt to use the Notification Email as user login.
-
+