From 9b8a0a7e5d79dadce8cd2d3eb67ddabb1c421eb4 Mon Sep 17 00:00:00 2001 From: metas-dev Date: Fri, 11 Sep 2020 20:48:55 +0200 Subject: [PATCH] update new release 5.151 --- app/Dockerfile | 2 +- db/Dockerfile | 2 +- docker-src/app/Dockerfile | 2 +- docker-src/webapi/Dockerfile | 2 +- ...c.js => bundle-26969e79a20834e1b0f1-git-622c4cc.js} | 8 ++++---- ... => bundle-26969e79a20834e1b0f1-git-622c4cc.js.map} | 2 +- docker-src/webui/sources/dist/index.html | 2 +- docker-src/webui/sources/dist/info.json | 10 +++++----- webapi/Dockerfile | 2 +- webui/Dockerfile | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) rename docker-src/webui/sources/dist/{bundle-2403b84356d2707a6ccf-git-81700ec.js => bundle-26969e79a20834e1b0f1-git-622c4cc.js} (96%) rename docker-src/webui/sources/dist/{bundle-2403b84356d2707a6ccf-git-81700ec.js.map => bundle-26969e79a20834e1b0f1-git-622c4cc.js.map} (91%) diff --git a/app/Dockerfile b/app/Dockerfile index 79c2aaf..a38fc33 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,4 +1,4 @@ -FROM metasfresh/metasfresh-app:5.150 +FROM metasfresh/metasfresh-app:5.151 COPY sources/configs/* /opt/metasfresh/ COPY sources/start_app.sh /opt/metasfresh/ diff --git a/db/Dockerfile b/db/Dockerfile index ddaef09..47a8c93 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM metasfresh/metasfresh-db:5.150 +FROM metasfresh/metasfresh-db:5.151 RUN localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8 RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 diff --git a/docker-src/app/Dockerfile b/docker-src/app/Dockerfile index ad3fa6f..d729be7 100644 --- a/docker-src/app/Dockerfile +++ b/docker-src/app/Dockerfile @@ -12,7 +12,7 @@ RUN apt -y install netcat \ && apt -y autoclean RUN mkdir -p /opt/metasfresh -RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.150.2-199+release/metasfresh-dist-dist-5.150.2-199+release-dist.tar.gz \ +RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.151.2-204+release/metasfresh-dist-dist-5.151.2-204+release-dist.tar.gz \ | tar -xzC /opt/metasfresh/ RUN mkdir -p /opt/metasfresh/heapdump diff --git a/docker-src/webapi/Dockerfile b/docker-src/webapi/Dockerfile index f39a286..3b04f61 100644 --- a/docker-src/webapi/Dockerfile +++ b/docker-src/webapi/Dockerfile @@ -15,7 +15,7 @@ COPY sources/configs/local_settings.properties /root/ RUN mkdir -p /opt/metasfresh-webui-api/metasfresh-webui-api \ && mkdir -p /opt/metasfresh-webui-api/log \ && mkdir -p /opt/metasfresh-webui-api/heapdump -RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.150.2-199+release/metasfresh-webui-api-5.150.2-199+release.jar \ +RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.151.2-204+release/metasfresh-webui-api-5.151.2-204+release.jar \ --output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \ && chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar diff --git a/docker-src/webui/sources/dist/bundle-2403b84356d2707a6ccf-git-81700ec.js b/docker-src/webui/sources/dist/bundle-26969e79a20834e1b0f1-git-622c4cc.js similarity index 96% rename from docker-src/webui/sources/dist/bundle-2403b84356d2707a6ccf-git-81700ec.js rename to docker-src/webui/sources/dist/bundle-26969e79a20834e1b0f1-git-622c4cc.js index d9cd650..a9924c3 100644 --- a/docker-src/webui/sources/dist/bundle-2403b84356d2707a6ccf-git-81700ec.js +++ b/docker-src/webui/sources/dist/bundle-26969e79a20834e1b0f1-git-622c4cc.js @@ -40,7 +40,7 @@ o.version="2.27.0",t=Ot,o.fn=yn,o.min=function(){var e=[].slice.call(arguments,0 object-assign (c) Sindre Sorhus @license MIT -*/var r=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,a=Object.prototype.propertyIsEnumerable;function i(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach((function(e){r[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,s,u=i(e),l=1;l0&&void 0!==arguments[0]?arguments[0]:"/",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:s.POP,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,r="string"==typeof e?(0,i.parsePath)(e):e,o=r.pathname||"/",a=r.search||"",u=r.hash||"",l=r.state;return{pathname:o,search:a,hash:u,state:l,action:t,key:n}};var l=function(e){return"[object Date]"===Object.prototype.toString.call(e)},c=t.statesAreEqual=function e(t,n){if(t===n)return!0;var o=void 0===t?"undefined":r(t);if(o!==(void 0===n?"undefined":r(n)))return!1;if("function"===o&&(0,a.default)(!1),"object"===o){if(l(t)&&l(n)&&(0,a.default)(!1),!Array.isArray(t)){var i=Object.keys(t),s=Object.keys(n);return i.length===s.length&&i.every((function(r){return e(t[r],n[r])}))}return Array.isArray(n)&&t.length===n.length&&t.every((function(t,r){return e(t,n[r])}))}return!1};t.locationsAreEqual=function(e,t){return e.key===t.key&&e.pathname===t.pathname&&e.search===t.search&&e.hash===t.hash&&c(e.state,t.state)}},function(e,t,n){(e.exports=n(1177)).tz.load(n(1179))},function(e,t,n){"use strict";(function(e){function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.setListId=l,t.setFilter=c,t.setSorting=d,t.setPagination=f,t.setListIncludedView=p,t.closeListIncludedView=_;var o,a=function(e){if(e&&e.__esModule)return e;if(null===e||"object"!==r(e)&&"function"!=typeof e)return{default:e};var t=i();if(t&&t.has(e))return t.get(e);var n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in e)if(Object.prototype.hasOwnProperty.call(e,a)){var s=o?Object.getOwnPropertyDescriptor(e,a):null;s&&(s.get||s.set)?Object.defineProperty(n,a,s):n[a]=e[a]}n.default=e,t&&t.set(e,n);return n}(n(62));function i(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return i=function(){return e},e}(o="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.enterModule:void 0)&&o(e);var s,u;"undefined"!=typeof reactHotLoaderGlobal&&reactHotLoaderGlobal.default.signature;function l(e,t){return{type:a.SET_LIST_ID,viewId:e,windowType:t}}function c(e,t){return{type:a.SET_LIST_FILTERS,filter:e,windowType:t}}function d(e,t){return{type:a.SET_LIST_SORTING,sort:e,windowType:t}}function f(e,t){return{type:a.SET_LIST_PAGINATION,page:e,windowType:t}}function p(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.windowType,n=e.viewId,r=e.viewProfileId,o=void 0===r?null:r;return{type:a.SET_LIST_INCLUDED_VIEW,payload:{windowType:t,viewId:n,viewProfileId:o}}}function _(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.windowType,n=e.viewId,r=e.forceClose,o=void 0!==r&&r;return{type:a.CLOSE_LIST_INCLUDED_VIEW,payload:{windowType:t,viewId:n,forceClose:o}}}(s="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.default:void 0)&&(s.register(l,"setListId","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js"),s.register(c,"setFilter","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js"),s.register(d,"setSorting","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js"),s.register(f,"setPagination","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js"),s.register(p,"setListIncludedView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js"),s.register(_,"closeListIncludedView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/ListActions.js")),(u="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.leaveModule:void 0)&&u(e)}).call(this,n(3)(e))},function(e,t,n){"use strict";(function(e){function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(t,"__esModule",{value:!0}),t.deleteTable=b,t.setActiveSort=v,t.deselectTableItems=w,t.updateTabRowsData=k,t.updateTableRowProperty=T,t.clearTableData=L,t.createTableData=O,t.createGridTable=S,t.updateGridTable=D,t.updateGridTableData=x,t.createTabTable=E,t.updateTabTable=A,t.updateTabTableData=P,t.collapseTableRow=j,t.updateTableSelection=I;var o,a=n(35),i=function(e){if(e&&e.__esModule)return e;if(null===e||"object"!==r(e)&&"function"!=typeof e)return{default:e};var t=c();if(t&&t.has(e))return t.get(e);var n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in e)if(Object.prototype.hasOwnProperty.call(e,a)){var i=o?Object.getOwnPropertyDescriptor(e,a):null;i&&(i.get||i.set)?Object.defineProperty(n,a,i):n[a]=e[a]}n.default=e,t&&t.set(e,n);return n}(n(62)),s=n(144),u=n(36),l=n(52);function c(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return c=function(){return e},e}function d(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function f(e){for(var t=1;t=o&&e.includedDocuments?(i=i.concat((0,l.createCollapsedMap)(e)),s=s.concat(e[a])):e.indent.length>o&&(u=u.concat(e[a]))})),r&&e(M({tableId:t,collapsedParentRows:s,collapsedRows:u,collapsedArrayMap:i}))}}function j(e){var t=e.tableId,n=e.collapse,r=e.node;return function(e,o){var i=(0,u.getTable)(o(),t),s=(0,a.cloneDeep)(i.collapsedParentRows),c=(0,a.cloneDeep)(i.collapsedRows),d=(0,a.cloneDeep)(i.collapsedArrayMap),f=i.keyProperty;!function e(t){if(d=(0,l.createCollapsedMap)(t,n,d),n)s.splice(s.indexOf(t[f]),1);else{if(s.indexOf(t[f])>-1)return;s=s.concat(t[f])}t.includedDocuments&&t.includedDocuments.map((function(t){if(n)c.splice(c.indexOf(t[f]),1);else{if(c.indexOf(t[f])>-1)return;c=c.concat(t[f]),t.includedDocuments&&e(t)}}))}(r);var p={tableId:t,collapsedRows:c,collapsedParentRows:s,collapsedArrayMap:d};return e(M(p)),Promise.resolve(p)}}function I(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"id";return function(r){return r({type:i.UPDATE_TABLE_SELECTION,payload:{id:e,selection:t,keyProperty:n}}),Promise.resolve(t)}}(_="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.default:void 0)&&(_.register(m,"createTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(y,"updateTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(b,"deleteTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(g,"updateTableData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(v,"setActiveSort","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(w,"deselectTableItems","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(M,"collapseRows","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(k,"updateTabRowsData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(T,"updateTableRowProperty","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(L,"clearTableData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(O,"createTableData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(S,"createGridTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(D,"updateGridTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(x,"updateGridTableData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(E,"createTabTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(A,"updateTabTable","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(P,"updateTabTableData","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(C,"createCollapsedRows","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(j,"collapseTableRow","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js"),_.register(I,"updateTableSelection","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/actions/TableActions.js")),(h="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.leaveModule:void 0)&&h(e)}).call(this,n(3)(e))},function(e,t,n){var r=n(9),o=Object.prototype.hasOwnProperty,a=Array.prototype.splice,i=Object.assign||function(e,t){for(var n=s(t),r=0;r32*this.bits.length){var n=e.makeArray(t);r.default.arraycopy(this.bits,0,n,0,this.bits.length),this.bits=n}},e.prototype.get=function(e){return 0!=(this.bits[Math.floor(e/32)]&1<<(31&e))},e.prototype.set=function(e){this.bits[Math.floor(e/32)]|=1<<(31&e)},e.prototype.flip=function(e){this.bits[Math.floor(e/32)]^=1<<(31&e)},e.prototype.getNextSet=function(e){var t=this.size;if(e>=t)return t;var n=this.bits,r=Math.floor(e/32),a=n[r];a&=~((1<<(31&e))-1);for(var i=n.length;0===a;){if(++r===i)return t;a=n[r]}var s=32*r+o.default.numberOfTrailingZeros(a);return s>t?t:s},e.prototype.getNextUnset=function(e){var t=this.size;if(e>=t)return t;var n=this.bits,r=Math.floor(e/32),a=~n[r];a&=~((1<<(31&e))-1);for(var i=n.length;0===a;){if(++r===i)return t;a=~n[r]}var s=32*r+o.default.numberOfTrailingZeros(a);return s>t?t:s},e.prototype.setBulk=function(e,t){this.bits[Math.floor(e/32)]=t},e.prototype.setRange=function(e,t){if(tthis.size)throw new i.default;if(t!==e){t--;for(var n=Math.floor(e/32),r=Math.floor(t/32),o=this.bits,a=n;a<=r;a++){var s=(2<<(an?0:31&e));o[a]|=s}}},e.prototype.clear=function(){for(var e=this.bits.length,t=this.bits,n=0;nthis.size)throw new i.default;if(t===e)return!0;t--;for(var r=Math.floor(e/32),o=Math.floor(t/32),a=this.bits,s=r;s<=o;s++){var u=(2<<(sr?0:31&e))&4294967295;if((a[s]&u)!==(n?u:0))return!1}return!0},e.prototype.appendBit=function(e){this.ensureCapacity(this.size+1),e&&(this.bits[Math.floor(this.size/32)]|=1<<(31&this.size)),this.size++},e.prototype.appendBits=function(e,t){if(t<0||t>32)throw new i.default("Num bits must be between 0 and 32");this.ensureCapacity(this.size+t);this.appendBit;for(var n=t;n>0;n--)this.appendBit(1==(e>>n-1&1))},e.prototype.appendBitArray=function(e){var t=e.size;this.ensureCapacity(this.size+t);this.appendBit;for(var n=0;n>1&1431655765|(1431655765&a)<<1)>>2&858993459|(858993459&a)<<2)>>4&252645135|(252645135&a)<<4)>>8&16711935|(16711935&a)<<8)>>16&65535|(65535&a)<<16,e[t-o]=a}if(this.size!==32*n){var i=32*n-this.size,s=e[0]>>>i;for(o=1;o>>i}e[n-1]=s}this.bits=e},e.makeArray=function(e){return new Int32Array(Math.floor((e+31)/32))},e.prototype.equals=function(t){if(!(t instanceof e))return!1;var n=t;return this.size===n.size&&a.default.equals(this.bits,n.bits)},e.prototype.hashCode=function(){return 31*this.size+a.default.hashCode(this.bits)},e.prototype.toString=function(){for(var e="",t=0,n=this.size;t=t&&(a^=e,a&=t-1);this.expTable=o;var s=new Int32Array(t);for(i=0;ie.length)&&(t=e.length);for(var n=0,r=new Array(t);n0&&void 0!==arguments[0]?arguments[0]:{},t=arguments[1];if(u)throw u;for(var r=!1,o={},a=0;a0&&void 0!==arguments[0]?arguments[0]:d,t=arguments.length>1?arguments[1]:void 0;if(!(t.payload&&t.payload.id||t.type===i.DELETE_VIEW))return e;switch(t.type){case i.FETCH_LAYOUT_PENDING:var n=t.payload,r=n.id,o=n.isModal,a=b(o),s=y(e,r,o);return u(u({},e),{},l({},"".concat(a),u(u({},e["".concat(a)]),{},l({},"".concat(r),u(u({},s),{},{layoutPending:!0,layoutNotFound:!1})))));case i.FETCH_LAYOUT_SUCCESS:var f=t.payload,p=f.id,_=f.layout,h=f.isModal,m=b(h),g=y(e,p,h);return u(u({},e),{},l({},"".concat(m),u(u({},e["".concat(m)]),{},l({},"".concat(p),u(u({},g),{},{layoutPending:!1,layoutError:!1,layout:u(u({},g.layout),_)})))));case i.FETCH_LAYOUT_ERROR:var v=t.payload,w=v.id,M=v.error,k=v.isModal,T=b(k),L=y(e,w,k);return u(u({},e),{},l({},"".concat(T),u(u({},e.views),{},l({},"".concat(w),u(u({},L),{},{layoutPending:!1,layoutError:M,layoutNotFound:!0})))));case i.FETCH_DOCUMENT_PENDING:var O=t.payload,S=O.id,D=O.isModal,x=b(D),E=y(e,S,D);return u(u({},e),{},l({},"".concat(x),u(u({},e["".concat(x)]),{},l({},"".concat(S),u(u({},E),{},{notFound:!1,pending:!0,error:null})))));case i.FETCH_DOCUMENT_SUCCESS:var A=t.payload,P=A.id,C=A.data,j=C.firstRow,I=C.headerProperties,R=C.pageLength,Y=C.size,N=C.type,H=C.viewId,z=C.windowId,q=C.orderBy,W=C.queryLimit,B=C.queryLimitHit,F=C.staticFilters,G=A.isModal,U=b(G),V=Y>1?j/R+1:1,X=y(e,P,G),K=u(u({},X),{},{firstRow:j,headerProperties:I,pageLength:R,type:N,viewId:H,windowId:z,orderBy:q,page:V,staticFilters:F,queryLimit:W,queryLimitHit:B,pending:!1});return u(u({},e),{},l({},"".concat(U),u(u({},e["".concat(U)]),{},l({},"".concat(P),u({},K)))));case i.UPDATE_VIEW_DATA_ERROR:case i.FETCH_DOCUMENT_ERROR:var J=t.payload,Q=J.id,Z=J.error,$=J.isModal,ee=b($),te=y(e,Q,$);return u(u({},e),{},l({},"".concat(ee),u(u({},e["".concat(ee)]),{},l({},"".concat(Q),u(u({},te),{},{pending:!1,notFound:!0,error:Z})))));case i.CREATE_VIEW:var ne=t.payload,re=ne.id,oe=ne.isModal,ae=b(oe),ie=y(e,re,oe);return u(u({},e),{},l({},"".concat(ae),u(u({},e["".concat(ae)]),{},l({},"".concat(re),u(u({},ie),{},{pending:!0,error:null})))));case i.CREATE_VIEW_SUCCESS:var se=t.payload,ue=se.id,le=se.viewId,ce=se.isModal,de=b(ce),fe=y(e,ue,ce);return u(u({},e),{},l({},"".concat(de),u(u({},e["".concat(de)]),{},l({},"".concat(ue),u(u({},fe),{},{viewId:le,pending:!1,notFound:!1})))));case i.CREATE_VIEW_ERROR:var pe=t.payload,_e=pe.id,he=pe.error,me=pe.isModal,ye=b(me),be=y(e,_e,me);return u(u({},e),{},l({},"".concat(ye),u(u({},e["".concat(ye)]),{},l({},"".concat(_e),u(u({},be),{},{pending:!1,notFound:!0,error:he})))));case i.UPDATE_VIEW_DATA_SUCCESS:var ge=t.payload,ve=ge.id,we=ge.data,Me=ge.isModal,ke=b(Me),Te=y(e,ve,Me),Le=u(u(u({},Te),we),{},{pending:!1,error:null,notFound:!1});return u(u({},e),{},l({},"".concat(ke),u(u({},e["".concat(ke)]),{},l({},"".concat(ve),u({},Le)))));case i.FILTER_VIEW_PENDING:var Oe=t.payload,Se=Oe.id,De=Oe.isModal,xe=b(De),Ee=y(e,Se,De);return u(u({},e),{},l({},"".concat(xe),u(u({},e["".concat(xe)]),{},l({},"".concat(Se),u(u({},Ee),{},{notFound:!1,pending:!0,error:null})))));case i.FILTER_VIEW_SUCCESS:var Ae=t.payload,Pe=Ae.id,Ce=Ae.data,je=Ce.filters,Ie=Ce.viewId,Re=Ce.size,Ye=Ae.isModal,Ne=b(Ye),He=y(e,Pe,Ye);return u(u({},e),{},l({},"".concat(Ne),u(u({},e["".concat(Ne)]),{},l({},"".concat(Pe),u(u({},He),{},{filters:je,viewId:Ie,size:Re,page:1,pending:!1})))));case i.FILTER_VIEW_ERROR:var ze=t.payload,qe=ze.id,We=ze.error,Be=ze.isModal,Fe=b(Be),Ge=y(e,qe,Be);return u(u({},e),{},l({},"".concat(Fe),u(u({},e["".concat(Fe)]),{},l({},"".concat(qe),u(u({},Ge),{},{pending:!1,notFound:!0,error:We})))));case i.ADD_VIEW_LOCATION_DATA:var Ue=t.payload,Ve=Ue.id,Xe=Ue.locationData,Ke=Ue.isModal,Je=b(Ke),Qe=y(e,Ve,Ke);return u(u({},e),{},l({},"".concat(Je),u(u({},e["".concat(Je)]),{},l({},"".concat(Ve),u(u({},Qe),{},{locationData:Xe})))));case i.FETCH_LOCATION_CONFIG_SUCCESS:var Ze=t.payload,$e=Ze.id,et=Ze.data,tt=Ze.isModal,nt=b(tt),rt=y(e,$e,tt);return et.provider?u(u({},e),{},l({},"".concat(nt),u(u({},e["".concat(nt)]),{},l({},"".concat($e),u(u({},rt),{},{mapConfig:et}))))):e;case i.FETCH_LOCATION_CONFIG_ERROR:var ot=t.payload,at=ot.id,it=ot.error,st=ot.isModal,ut=b(st),lt=y(e,at,st);return u(u({},e),{},l({},"".concat(ut),u(u({},e["".concat(ut)]),{},l({},"".concat(at),u(u({},lt),{},{error:it})))));case i.TOGGLE_INCLUDED_VIEW:var ct=t.payload,dt=ct.id,ft=ct.showIncludedView,pt=ct.isModal,_t=b(pt),ht=y(e,dt,pt);return ht.windowId?u(u({},e),{},l({},"".concat(_t),u(u({},e["".concat(_t)]),{},l({},"".concat(dt),u(u({},ht),{},{isShowIncluded:!!ft,hasShowIncluded:!!ft}))))):e;case i.DELETE_VIEW:var mt=t.payload,yt=mt.id,bt=mt.isModal,gt=b(bt);return yt&&delete e["".concat(gt)][yt],e;case i.RESET_VIEW:var vt=t.payload,wt=vt.id,Mt=vt.isModal,kt=b(Mt),Tt=y(e,wt,Mt);return Tt?u(u({},e),{},l({},"".concat(kt),u(u({},e["".concat(kt)]),{},l({},"".concat(wt),u({},c))))):e;default:return e}}(h="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.default:void 0)&&(h.register(c,"viewState","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(d,"initialState","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(f,"selectView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(p,"selectLocalView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(_,"getView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(y,"getLocalView","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(b,"getViewType","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js"),h.register(g,"viewHandler","/var/lib/jenkins/workspace/metasfresh_release/frontend/src/reducers/viewHandler.js")),(m="undefined"!=typeof reactHotLoaderGlobal?reactHotLoaderGlobal.leaveModule:void 0)&&m(e)}).call(this,n(3)(e))},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){var r=n(661),o="object"==typeof self&&self&&self.Object===Object&&self,a=r||o||Function("return this")();e.exports=a},function(e,t,n){"use strict";var r=n(13),o=n(678);function a(e,t,n){o.call(this,e,t,n,{noCredentials:!0})}r(a,o),a.enabled=o.enabled,e.exports=a},function(e,t,n){"use strict";(function(t){e.exports={isOpera:function(){return t.navigator&&/opera/i.test(t.navigator.userAgent)},isKonqueror:function(){return t.navigator&&/konqueror/i.test(t.navigator.userAgent)},hasDomain:function(){if(!t.document)return!0;try{return!!t.document.domain}catch(e){return!1}}}}).call(this,n(12))},function(e,t,n){"use strict";(function(t){var r=n(87),o=n(80),a=n(148);e.exports={WPrefix:"_jp",currentWindowId:null,polluteGlobalNamespace:function(){e.exports.WPrefix in t||(t[e.exports.WPrefix]={})},postMessage:function(n,r){t.parent!==t&&t.parent.postMessage(o.stringify({windowId:e.exports.currentWindowId,type:n,data:r||""}),"*")},createIframe:function(e,n){var o,a,i=t.document.createElement("iframe"),s=function(){clearTimeout(o);try{i.onload=null}catch(e){}i.onerror=null},u=function(){i&&(s(),setTimeout((function(){i&&i.parentNode.removeChild(i),i=null}),0),r.unloadDel(a))},l=function(e){i&&(u(),n(e))};return i.src=e,i.style.display="none",i.style.position="absolute",i.onerror=function(){l("onerror")},i.onload=function(){clearTimeout(o),o=setTimeout((function(){l("onload timeout")}),2e3)},t.document.body.appendChild(i),o=setTimeout((function(){l("timeout")}),15e3),a=r.unloadAdd(u),{post:function(e,t){setTimeout((function(){try{i&&i.contentWindow&&i.contentWindow.postMessage(e,t)}catch(e){}}),0)},cleanup:u,loaded:s}},createHtmlfile:function(n,o){var a,i,s,u=["Active"].concat("Object").join("X"),l=new t[u]("htmlfile"),c=function(){clearTimeout(a),s.onerror=null},d=function(){l&&(c(),r.unloadDel(i),s.parentNode.removeChild(s),s=l=null,CollectGarbage())},f=function(e){l&&(d(),o(e))};l.open(),l.write(' - + diff --git a/docker-src/webui/sources/dist/info.json b/docker-src/webui/sources/dist/info.json index 4a5422a..a2ad551 100644 --- a/docker-src/webui/sources/dist/info.json +++ b/docker-src/webui/sources/dist/info.json @@ -1,10 +1,10 @@ { "build": { - "releaseVersion": "5.150.2-200+release", - "jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/200/", - "jenkinsBuildNo": "200", + "releaseVersion": "5.151.2-203+release", + "jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/203/", + "jenkinsBuildNo": "203", "jenkinsJobName": "metasfresh/release", - "jenkinsBuildTag": "jenkins-metasfresh-release-200" - "gitSHA1": "81700ec04c6074befdcd1eeae4a52ba8a71a0b72" + "jenkinsBuildTag": "jenkins-metasfresh-release-203" + "gitSHA1": "622c4cc22b952509bffa32325c2c25ef0a878236" } } \ No newline at end of file diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 7cb0f30..f4eb86c 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM metasfresh/metasfresh-webapi:5.150 +FROM metasfresh/metasfresh-webapi:5.151 COPY sources/configs/* /opt/metasfresh-webui-api/ COPY sources/start_webapi.sh /opt/metasfresh-webui-api/ diff --git a/webui/Dockerfile b/webui/Dockerfile index d2d1c5b..144a834 100644 --- a/webui/Dockerfile +++ b/webui/Dockerfile @@ -1,4 +1,4 @@ -FROM metasfresh/metasfresh-webui:5.150 +FROM metasfresh/metasfresh-webui:5.151 COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/