From df4db19f84149e649d9a69836cad64d954b24bb4 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Mon, 12 Nov 2018 17:23:21 +0300 Subject: [PATCH 01/39] Components don't work properly inside modal dialog (Issue #64, PR #65) * #64 Fix - components don't work properly inside modal dialog --- package.json | 1 + .../DateInput/DateInput.DOCUMENTATION.md | 17 +++++++++++------ .../DateInput/DateInput.SCOPE.react.js | 13 ++++++++++++- src/client/components/DateInput/DateInput.less | 4 ++-- .../DatePicker/DatePicker.DOCUMENTATION.md | 11 +++++++++++ .../DatePicker/DatePicker.SCOPE.react.js | 14 +++++++++++++- .../components/DatePicker/DatePicker.less | 2 +- .../DateRangeInput.DOCUMENTATION.md | 17 +++++++++++------ .../DateRangeInput.SCOPE.react.js | 14 +++++++++++++- .../DateRangeInput/DateRangeInput.less | 2 +- 10 files changed, 76 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index d8549daa..82927349 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "postcss-loader": "1.3.3", "postcss-modules": "0.6.4", "progress-bar-webpack-plugin": "1.10.0", + "react-bootstrap": "0.32.4", "raw-loader": "0.5.1", "react": "16.2.0", "react-dom": "16.2.0", diff --git a/src/client/components/DateInput/DateInput.DOCUMENTATION.md b/src/client/components/DateInput/DateInput.DOCUMENTATION.md index 0a34a1ce..d9e2de75 100644 --- a/src/client/components/DateInput/DateInput.DOCUMENTATION.md +++ b/src/client/components/DateInput/DateInput.DOCUMENTATION.md @@ -28,12 +28,17 @@ Based on configured to OpusCapita defaults [react-day-picker](https://github.com ### Code Example ```jsx - + + + + + +
diff --git a/src/client/components/DateInput/DateInput.SCOPE.react.js b/src/client/components/DateInput/DateInput.SCOPE.react.js index fa192438..682a0dfa 100644 --- a/src/client/components/DateInput/DateInput.SCOPE.react.js +++ b/src/client/components/DateInput/DateInput.SCOPE.react.js @@ -5,7 +5,9 @@ import React, { Component } from 'react'; import { showroomScopeDecorator } from '@opuscapita/react-showroom-client'; +import { Modal } from 'react-bootstrap'; +window.Modal = Modal; @showroomScopeDecorator export default @@ -13,7 +15,8 @@ class DateInputScope extends Component { constructor(props) { super(props); this.state = { - value: null + value: null, + openModal: false }; } @@ -21,6 +24,14 @@ class DateInputScope extends Component { this.setState({ value }); } + handleOpenModal = () => { + this.setState({ openModal: true }); + } + + handleHideModal = () => { + this.setState({ openModal: false }); + } + render() { let value = this.state.value ? this.state.value.toString() : 'not selected yet'; diff --git a/src/client/components/DateInput/DateInput.less b/src/client/components/DateInput/DateInput.less index b84c5712..bca773e5 100644 --- a/src/client/components/DateInput/DateInput.less +++ b/src/client/components/DateInput/DateInput.less @@ -31,9 +31,9 @@ will-change: opacity, max-height; background: #fff; box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); - position: absolute; + position: fixed; overflow: hidden; - z-index: 900; + z-index: 9999; } .opuscapita_date-input__variants-container { diff --git a/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md b/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md index a1d3bc13..ed317a71 100644 --- a/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md +++ b/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md @@ -49,6 +49,17 @@ See react-day-picker [methods reference](http://react-day-picker.js.org/APIMetho showToTop={true} showToLeft={true} /> + + + + + + + ``` ### Component Name diff --git a/src/client/components/DatePicker/DatePicker.SCOPE.react.js b/src/client/components/DatePicker/DatePicker.SCOPE.react.js index 91a7435a..71125bbe 100644 --- a/src/client/components/DatePicker/DatePicker.SCOPE.react.js +++ b/src/client/components/DatePicker/DatePicker.SCOPE.react.js @@ -5,6 +5,9 @@ import React, { Component } from 'react'; import { showroomScopeDecorator } from '@opuscapita/react-showroom-client'; +import { Modal } from 'react-bootstrap'; + +window.Modal = Modal; @showroomScopeDecorator @@ -13,10 +16,19 @@ class DatePickerScope extends Component { constructor(props) { super(props); this.state = { - value: null + value: null, + openModal: false }; } + handleOpenModal = () => { + this.setState({ openModal: true }); + } + + handleHideModal = () => { + this.setState({ openModal: false }); + } + handleChange(value) { this.setState({ value }); } diff --git a/src/client/components/DatePicker/DatePicker.less b/src/client/components/DatePicker/DatePicker.less index 02d430b4..14545137 100644 --- a/src/client/components/DatePicker/DatePicker.less +++ b/src/client/components/DatePicker/DatePicker.less @@ -9,7 +9,7 @@ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); overflow: hidden; position: absolute; - z-index: 999; + z-index: 9999; } .opuscapita_date-picker__picker-container:focus { diff --git a/src/client/components/DateRangeInput/DateRangeInput.DOCUMENTATION.md b/src/client/components/DateRangeInput/DateRangeInput.DOCUMENTATION.md index ffb69bf0..52180080 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.DOCUMENTATION.md +++ b/src/client/components/DateRangeInput/DateRangeInput.DOCUMENTATION.md @@ -26,12 +26,17 @@ Allows select date range using mouse. ### Code Example ```jsx - + + + + + +
diff --git a/src/client/components/DateRangeInput/DateRangeInput.SCOPE.react.js b/src/client/components/DateRangeInput/DateRangeInput.SCOPE.react.js index 733663f6..3f8f6350 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.SCOPE.react.js +++ b/src/client/components/DateRangeInput/DateRangeInput.SCOPE.react.js @@ -5,6 +5,9 @@ import React, { Component } from 'react'; import { showroomScopeDecorator } from '@opuscapita/react-showroom-client'; +import { Modal } from 'react-bootstrap'; + +window.Modal = Modal; @showroomScopeDecorator @@ -16,10 +19,19 @@ class DateRangeInputScope extends Component { value1: [null, null], value2: [new Date(), new Date()], value3: [null, null], - value4: [null, null] + value4: [null, null], + openModal: false, }; } + handleOpenModal = () => { + this.setState({ openModal: true }); + } + + handleHideModal = () => { + this.setState({ openModal: false }); + } + handleChange1(value) { this.setState({ value1: value }); } diff --git a/src/client/components/DateRangeInput/DateRangeInput.less b/src/client/components/DateRangeInput/DateRangeInput.less index 5359887e..973b27df 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.less +++ b/src/client/components/DateRangeInput/DateRangeInput.less @@ -12,7 +12,7 @@ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); overflow: hidden; position: absolute; - z-index: 900; + z-index: 9999; } .opuscapita_date-range-input__variants-container { From f142f0e36da56045c330b2e506c9d37ccde2f8c7 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Mon, 12 Nov 2018 17:37:47 +0300 Subject: [PATCH 02/39] Releasing version - 0.5.6. [ci skip] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 911668bd..8d4dbaae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +[Release 0.5.6](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.6) Mon Nov 12 2018 17:37:47 GMT+0300 (MSK) +======================================================= + +- Components don't work properly inside modal dialog (Issue [#64](https://github.com/OpusCapita/react-dates/issues/64), PR [#65](https://github.com/OpusCapita/react-dates/issues/65)) (GitHub kvolkovich-sc@users.noreply.github.com, 2018-11-12 17:23:21 +0300) +- Using docker image opuscapita/minsk-core-ci tag grails-2.4.4-jdk-8u131-nodejs-6.9.4-maven-3.3.9 [ci skip] (Alexey Sergeev alexey.sergeev@opuscapita.com, 2018-09-07 09:08:30 +0300) + [Release 0.5.5](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.5) Thu Aug 23 2018 16:09:24 GMT+0300 (MSK) ======================================================= From 4648bc3e5fabeb55e7764b404066095edfb40cf4 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Mon, 12 Nov 2018 17:37:50 +0300 Subject: [PATCH 03/39] Advancing project version to the next development - 0.5.7. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 728dc0c4..f5f3d54c 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.6", + "version": "0.5.7", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 82927349..5c61cc49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.6", + "version": "0.5.7", "description": "Start write new project with no effort.", "keywords": [ "react", From 44d477e44ddac149f4f07115f233f1154c428db5 Mon Sep 17 00:00:00 2001 From: Dmitry Divin Date: Thu, 4 Apr 2019 15:39:22 +0300 Subject: [PATCH 04/39] (#67) Remove portal usage from drop down popup --- package.json | 3 +- .../components/DateInput/DateInput.less | 20 +++++- .../components/DateInput/DateInput.react.js | 63 +++++++++---------- .../DatePicker/DatePicker.DOCUMENTATION.md | 11 ---- .../components/DatePicker/DatePicker.less | 16 ++++- .../components/DatePicker/DatePicker.react.js | 51 ++++++++------- .../components/DatePicker/DatePicker.spec.js | 6 -- .../DateRangeInput/DateRangeInput.less | 17 +++++ .../DateRangeInput/DateRangeInput.react.js | 61 ++++++++---------- 9 files changed, 138 insertions(+), 110 deletions(-) diff --git a/package.json b/package.json index 5c61cc49..3e53d097 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "dayjs": "1.6.4", "lodash": "4.17.4", "prop-types": "15.6.0", - "react-day-picker": "6.1.0", - "react-portal": "4.1.2" + "react-day-picker": "6.1.0" }, "devDependencies": { "@opuscapita/npm-scripts": "2.0.0-beta.2", diff --git a/src/client/components/DateInput/DateInput.less b/src/client/components/DateInput/DateInput.less index bca773e5..3a1b1f9e 100644 --- a/src/client/components/DateInput/DateInput.less +++ b/src/client/components/DateInput/DateInput.less @@ -31,13 +31,31 @@ will-change: opacity, max-height; background: #fff; box-shadow: 0 2px 6px rgba(0, 0, 0, 0.35); - position: fixed; + position: absolute; overflow: hidden; z-index: 9999; + + display: inline-flex; + left: 0; + bottom: -4px; + transform: translate(0, 100%); } .opuscapita_date-input__variants-container { white-space: nowrap; + right: 0; +} + +.opuscapita_date-input__variants-container--to-top, +.opuscapita_date-input__picker-container--to-top { + bottom: auto; + top: -4px; + transform: translate(0, -100%); +} + +.opuscapita_date-input__picker-container--to-left { + left: auto; + right: 0; } .opuscapita_date-input__variants-btn { diff --git a/src/client/components/DateInput/DateInput.react.js b/src/client/components/DateInput/DateInput.react.js index a458705c..cfb79a37 100644 --- a/src/client/components/DateInput/DateInput.react.js +++ b/src/client/components/DateInput/DateInput.react.js @@ -9,8 +9,7 @@ import { spring, presets, Motion } from 'react-motion'; import dayjs from '../../dayjs'; import getMessage from '../translations'; import isEqual from 'lodash/isEqual'; -import { Portal } from 'react-portal'; -import { getCoords, splitProps, zeroTime } from '../utils'; +import { splitProps, zeroTime } from '../utils'; let springPreset = presets.gentle; let easeOutCubic = (t) => (--t) * t * t + 1; // eslint-disable-line no-param-reassign @@ -257,8 +256,10 @@ class DateInput extends Component { /> ); + let showToTopClassName = showToTop ? 'opuscapita_date-input__picker-container--to-top' : ''; + let showToLeftClassName = showToLeft ? 'opuscapita_date-input__picker-container--to-left' : ''; + let hasErrorClassName = (error === null && isValid) ? '' : 'has-error'; - let { top, left, alwaysLeft } = getCoords(this.container, showToTop, showToLeft); let pickerMotionElement = ( {interpolatedStyle => ( - -
(this.pickerContainer = ref)} - className={`opuscapita_date-input__picker-container`} - style={{ - maxHeight: `${interpolatedStyle.x * 640}px`, - opacity: easeOutCubic(interpolatedStyle.x), - top: `${top}px`, - left: `${left}px`, - transform: `translate(${showToLeft ? '-100%' : '0'}, ${showToTop ? '-100%' : '0'})` - }} - > - {pickerElement} -
- +
(this.pickerContainer = ref)} + className={` +opuscapita_date-input__picker-container +${showToTopClassName} ${showToLeftClassName} + `} + style={{ + maxHeight: `${interpolatedStyle.x * 640}px`, + opacity: easeOutCubic(interpolatedStyle.x) + }} + > + {pickerElement} +
)} ); @@ -320,21 +319,19 @@ class DateInput extends Component { style={{ x: showVariants ? spring(1, springPreset) : spring(0, springPreset) }} > {interpolatedStyle => ( - -
(this.variantsContainer = ref)} - className={`opuscapita_date-input__variants-container`} - style={{ - maxHeight: `${interpolatedStyle.x * 640}px`, - opacity: easeOutCubic(interpolatedStyle.x), - top: `${top}px`, - left: `${alwaysLeft}px`, - transform: `translate(-100%, ${showToTop ? '-100%' : '0'})` - }} - > - {variantsElement} -
- +
(this.variantsContainer = ref)} + className={` + opuscapita_date-input__variants-container + ${showToTop ? 'opuscapita_date-input__variants-container--to-top' : ''} + `} + style={{ + maxHeight: `${interpolatedStyle.x * 640}px`, + opacity: easeOutCubic(interpolatedStyle.x) + }} + > + {variantsElement} +
)} ) : null; diff --git a/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md b/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md index ed317a71..260ae42d 100644 --- a/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md +++ b/src/client/components/DatePicker/DatePicker.DOCUMENTATION.md @@ -31,17 +31,6 @@ See react-day-picker [methods reference](http://react-day-picker.js.org/APIMetho ### Code Example ```jsx -
- -
- (--t) * t * t + 1; // eslint-disable-line no-param-reassign @@ -48,6 +47,15 @@ class DatePicker extends Component { document.body.addEventListener('keydown', this.handleBodyKeyDown); } + componentWillReceiveProps(nextProps) { + if (this.props.value !== nextProps.value) { + let month = nextProps.value || new Date(); + if (this.reactDayPicker) { + this.reactDayPicker.showMonth(month); + } + } + } + shouldComponentUpdate(nextProps, nextState) { return ( this.state.showPicker !== nextState.showPicker || @@ -63,10 +71,10 @@ class DatePicker extends Component { componentWillUnmount() { document.body.removeEventListener('click', this.handleBodyClick); - document.body.removeEventListener('keydown', this.handlePortalClose); + document.body.removeEventListener('keydown', this.handleKeyDown); } - handlePortalClose = event => { + handleKeyDown = event => { this.hidePicker(); }; @@ -112,6 +120,8 @@ class DatePicker extends Component { }; showPicker() { + let month = this.props.value || new Date(); + this.reactDayPicker.showMonth(month); this.setState({ showPicker: true }); } @@ -152,7 +162,8 @@ class DatePicker extends Component { /> ); - let { top, left } = getCoords(this.container, showToTop, showToLeft); + let showToTopClassName = showToTop ? 'opuscapita_date-picker__picker-container--to-top' : ''; + let showToLeftClassName = showToLeft ? 'opuscapita_date-picker__picker-container--to-left' : ''; let pickerMotionElement = ( {interpolatedStyle => ( - { this.datePickerRef = ref }} + className={` + opuscapita_date-picker__picker-container + ${showToTopClassName} ${showToLeftClassName} + `} + style={{ + maxHeight: `${interpolatedStyle.x * 640}px`, + opacity: easeOutCubic(interpolatedStyle.x) + }} > -
{ this.datePickerRef = ref }} - className={`opuscapita_date-picker__picker-container`} - style={{ - maxHeight: `${interpolatedStyle.x * 640}px`, - opacity: easeOutCubic(interpolatedStyle.x), - top: `${top}px`, - left: `${left}px`, - transform: `translate(${showToLeft ? '-100%' : '0'}, ${showToTop ? '-100%' : '0'})` - }} - > - {pickerElement} -
- + {pickerElement} + )} ); @@ -185,6 +191,7 @@ class DatePicker extends Component { return (
(this.container = el)} { ...commonProps } > diff --git a/src/client/components/DatePicker/DatePicker.spec.js b/src/client/components/DatePicker/DatePicker.spec.js index 6062b81d..ef081f0a 100644 --- a/src/client/components/DatePicker/DatePicker.spec.js +++ b/src/client/components/DatePicker/DatePicker.spec.js @@ -22,12 +22,6 @@ describe('', () => { expect(wrapper.hasClass('test-class-name')).to.be.true; }); - it('should have picker-container', () => { - let wrapper = mount(); - let pickerContainers = document.getElementsByClassName('opuscapita_date-picker__picker-container'); - expect(pickerContainers).to.have.lengthOf(1); - }); - it.skip('+ should pass specific DayPicker props to it', () => { let wrapper = mount( (--t) * t * t + 1; // eslint-disable-line no-param-reassign @@ -355,6 +354,9 @@ class DateRangeInput extends Component { let { enteredTo, error, focused, showPicker, showVariants } = this.state; let dayjsCompatibleDateFormat = dateFormat.replace(/d/g, 'D').replace(/y/g, 'Y'); + let showToTopClassName = showToTop ? 'opuscapita_date-range-input__picker-container--to-top' : ''; + let showToLeftClassName = showToLeft ? 'opuscapita_date-range-input__picker-container--to-left' : ''; + let pickerElement = ( {interpolatedStyle => ( - -
(this.pickerContainer = ref)} - className={`opuscapita_date-range-input__picker-container`} - style={{ - maxHeight: `${interpolatedStyle.x * 640}px`, - opacity: easeOutCubic(interpolatedStyle.x), - top: `${top}px`, - left: `${left}px`, - transform: `translate(${showToLeft ? '-100%' : '0'}, ${showToTop ? '-100%' : '0'})` - }} - > - {pickerElement} -
- +
(this.pickerContainer = ref)} + className={`opuscapita_date-range-input__picker-container ${showToTopClassName} ${showToLeftClassName}`} + style={{ + maxHeight: `${interpolatedStyle.x * 640}px`, + opacity: easeOutCubic(interpolatedStyle.x) + }} + > + {pickerElement} +
)} ); @@ -425,21 +420,19 @@ class DateRangeInput extends Component { style={{ x: showVariants ? spring(1, springPreset) : spring(0, springPreset) }} > {interpolatedStyle => ( - -
(this.variantsContainer = ref)} - className={`opuscapita_date-range-input__variants-container`} - style={{ - maxHeight: `${interpolatedStyle.x * 640}px`, - opacity: easeOutCubic(interpolatedStyle.x), - top: `${top}px`, - left: `${alwaysLeft}px`, - transform: `translate(-100%, ${showToTop ? '-100%' : '0'})` - }} - > - {variantsElement} -
- +
(this.variantsContainer = ref)} + className={` + opuscapita_date-range-input__variants-container + ${showToTop ? 'opuscapita_date-range-input__variants-container--to-top' : ''} + `} + style={{ + maxHeight: `${interpolatedStyle.x * 640}px`, + opacity: easeOutCubic(interpolatedStyle.x) + }} + > + {variantsElement} +
)} ) : null; From a16682a9837009d539faa12ed590d9d3b26c84f1 Mon Sep 17 00:00:00 2001 From: Dmitry Divin Date: Thu, 4 Apr 2019 15:40:46 +0300 Subject: [PATCH 05/39] Releasing version - 0.5.7. [ci skip] --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d4dbaae..e8d62199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.7](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.7) Thu Apr 04 2019 15:40:46 GMT+0300 (MSK) +======================================================= + +- ([#67](https://github.com/OpusCapita/react-dates/issues/67)) Remove portal usage from drop down popup (Dmitry Divin divin@scand.com, 2019-04-04 15:39:22 +0300) + [Release 0.5.6](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.6) Mon Nov 12 2018 17:37:47 GMT+0300 (MSK) ======================================================= From 63f1d89ea7b7784832513af4fbf5d4e4ba6c0c3f Mon Sep 17 00:00:00 2001 From: Dmitry Divin Date: Thu, 4 Apr 2019 15:40:50 +0300 Subject: [PATCH 06/39] Advancing project version to the next development - 0.5.8-SNAPSHOT. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index f5f3d54c..f6a51cc8 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.7", + "version": "0.5.8-SNAPSHOT", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 3e53d097..8322cbee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.7", + "version": "0.5.8-SNAPSHOT", "description": "Start write new project with no effort.", "keywords": [ "react", From f28350316315530564f676ad4859503e89817f84 Mon Sep 17 00:00:00 2001 From: kvolkovich-sc Date: Fri, 5 Apr 2019 19:09:49 +0300 Subject: [PATCH 07/39] Fix z-index conflict with react-select --- src/client/components/DateRangeInput/DateRangeInput.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/components/DateRangeInput/DateRangeInput.less b/src/client/components/DateRangeInput/DateRangeInput.less index 41f2788d..996e2634 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.less +++ b/src/client/components/DateRangeInput/DateRangeInput.less @@ -36,7 +36,7 @@ position: absolute; top: 0; right: 1ch; - z-index: 10; + z-index: 1; } .opuscapita_date-range-input__input-field { @@ -110,7 +110,7 @@ display: inline-flex; align-items: center; justify-content: center; - z-index: 10; + z-index: 1; pointer-events: none; color: #aaa; padding-right: 24px; From bcba0fafd77f69dbc200424415d9c09f47e523f5 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Fri, 5 Apr 2019 19:11:51 +0300 Subject: [PATCH 08/39] Releasing version - 0.5.8. [ci skip] --- CHANGELOG.md | 5 +++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8d62199..633a764e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.8](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.8) Fri Apr 05 2019 19:11:51 GMT+0300 (MSK) +======================================================= + +- Fix z-index conflict with react-select (kvolkovich-sc kirill.volkovich@opuscapita.com, 2019-04-05 19:09:49 +0300) + [Release 0.5.7](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.7) Thu Apr 04 2019 15:40:46 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index f6a51cc8..6db95a96 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.8-SNAPSHOT", + "version": "0.5.8", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 8322cbee..449c9235 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.8-SNAPSHOT", + "version": "0.5.8", "description": "Start write new project with no effort.", "keywords": [ "react", From 8ec2979e5774876f174b905f8c53c3be885fffb9 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Fri, 5 Apr 2019 19:11:55 +0300 Subject: [PATCH 09/39] Advancing project version to the next development - 0.5.9-SNAPSHOT. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 6db95a96..0c7e1f47 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.8", + "version": "0.5.9-SNAPSHOT", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 449c9235..161cf6df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.8", + "version": "0.5.9-SNAPSHOT", "description": "Start write new project with no effort.", "keywords": [ "react", From d3475b8ad6a0f97845e86436cff25a48c0e8b717 Mon Sep 17 00:00:00 2001 From: Egor Stambakio <31243790+estambakio-sc@users.noreply.github.com> Date: Mon, 27 May 2019 08:21:06 +0200 Subject: [PATCH 10/39] Stick variants picker to the right (#70) --- src/client/components/DateInput/DateInput.less | 10 ++++++---- .../components/DateRangeInput/DateRangeInput.less | 9 +++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/client/components/DateInput/DateInput.less b/src/client/components/DateInput/DateInput.less index 3a1b1f9e..7cfde9c3 100644 --- a/src/client/components/DateInput/DateInput.less +++ b/src/client/components/DateInput/DateInput.less @@ -35,15 +35,18 @@ overflow: hidden; z-index: 9999; - display: inline-flex; - left: 0; bottom: -4px; transform: translate(0, 100%); } +.opuscapita_date-input__picker-container { + left: 0; +} + .opuscapita_date-input__variants-container { white-space: nowrap; right: 0; + left: auto; } .opuscapita_date-input__variants-container--to-top, @@ -54,8 +57,7 @@ } .opuscapita_date-input__picker-container--to-left { - left: auto; - right: 0; + left: 0; } .opuscapita_date-input__variants-btn { diff --git a/src/client/components/DateRangeInput/DateRangeInput.less b/src/client/components/DateRangeInput/DateRangeInput.less index 996e2634..00199a84 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.less +++ b/src/client/components/DateRangeInput/DateRangeInput.less @@ -14,15 +14,20 @@ position: absolute; z-index: 9999; - display: inline-flex; - left: 0; bottom: -4px; transform: translate(0, 100%); } +.opuscapita_date-range-input__picker-container { + left: 0; +} + .opuscapita_date-range-input__variants-container { + right: 0; + left: auto; white-space: nowrap; } + .opuscapita_date-range-input__picker-container:focus { outline: none; } From 12da6373c190e4fe5745ef2dcc55c59953501294 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Mon, 27 May 2019 09:32:22 +0300 Subject: [PATCH 11/39] Releasing version - 0.5.9. [ci skip] --- CHANGELOG.md | 5 +++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 633a764e..7ec35af1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.9](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.9) Mon May 27 2019 09:32:22 GMT+0300 (MSK) +======================================================= + +- Stick variants picker to the right ([#70](https://github.com/OpusCapita/react-dates/issues/70)) (GitHub 31243790+estambakio-sc@users.noreply.github.com, 2019-05-27 08:21:06 +0200) + [Release 0.5.8](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.8) Fri Apr 05 2019 19:11:51 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 0c7e1f47..55509664 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.9-SNAPSHOT", + "version": "0.5.9", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 161cf6df..ddd0d63d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.9-SNAPSHOT", + "version": "0.5.9", "description": "Start write new project with no effort.", "keywords": [ "react", From db065536269942e00e5078fd8e5eced8a825df84 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Mon, 27 May 2019 09:32:26 +0300 Subject: [PATCH 12/39] Advancing project version to the next development - 0.5.10. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 55509664..9e553ef5 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.9", + "version": "0.5.10", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index ddd0d63d..1aaec933 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.9", + "version": "0.5.10", "description": "Start write new project with no effort.", "keywords": [ "react", From 2c17666b77453a18ab1cc048c3c31a68910a43c6 Mon Sep 17 00:00:00 2001 From: kvolkovich-sc Date: Mon, 29 Jul 2019 13:38:52 +0300 Subject: [PATCH 13/39] #71 Fix input placeholder color under IE/Edge --- src/client/components/DateInputField/DateInputField.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/components/DateInputField/DateInputField.less b/src/client/components/DateInputField/DateInputField.less index 249739f3..3d5fcfe9 100644 --- a/src/client/components/DateInputField/DateInputField.less +++ b/src/client/components/DateInputField/DateInputField.less @@ -7,4 +7,8 @@ &::-ms-clear { display: none !important; } + + &:-ms-input-placeholder { + color: #999; + } } From 167fae80e5bb4f77be5be7c8767c0b68be7c8139 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Mon, 29 Jul 2019 13:41:42 +0300 Subject: [PATCH 14/39] Releasing version - 0.5.10. [ci skip] --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ec35af1..eb12c07e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.10](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.10) Mon Jul 29 2019 13:41:42 GMT+0300 (MSK) +======================================================= + +- [#71](https://github.com/OpusCapita/react-dates/issues/71) Fix input placeholder color under IE/Edge (kvolkovich-sc volkovich@scand.com, 2019-07-29 13:38:52 +0300) + [Release 0.5.9](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.9) Mon May 27 2019 09:32:22 GMT+0300 (MSK) ======================================================= From 9660599696f4831de1e9efe619a9393c7334fbd5 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Mon, 29 Jul 2019 13:41:47 +0300 Subject: [PATCH 15/39] Advancing project version to the next development - 0.5.11. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 9e553ef5..5e0c7b8e 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.10", + "version": "0.5.11", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 1aaec933..fe78e8d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.10", + "version": "0.5.11", "description": "Start write new project with no effort.", "keywords": [ "react", From 28e1e83afd152b33d4f1491c94de752e0f49d903 Mon Sep 17 00:00:00 2001 From: kvolkovich-sc Date: Tue, 30 Jul 2019 14:08:24 +0300 Subject: [PATCH 16/39] #71 Fix input placeholder color --- src/client/components/DateInputField/DateInputField.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/client/components/DateInputField/DateInputField.less b/src/client/components/DateInputField/DateInputField.less index 3d5fcfe9..9fb7798a 100644 --- a/src/client/components/DateInputField/DateInputField.less +++ b/src/client/components/DateInputField/DateInputField.less @@ -8,7 +8,9 @@ display: none !important; } - &:-ms-input-placeholder { - color: #999; - } + &::placeholder { color: #999; } + &::-moz-placeholder { color: #999; } + &::-webkit-input-placeholder { color: #999; } + &:-ms-input-placeholder { color: #999; } + &::-ms-input-placeholder { color: #999; } } From 9bd16dffd4e062d34583a4491e3b0fe3a7c83f55 Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Tue, 30 Jul 2019 14:10:01 +0300 Subject: [PATCH 17/39] Releasing version - 0.5.11. [ci skip] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb12c07e..db27d062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +[Release 0.5.11](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.11) Tue Jul 30 2019 14:10:01 GMT+0300 (MSK) +======================================================= + +- Merge branch 'master' of github.com:OpusCapita/react-dates (kvolkovich-sc volkovich@scand.com, 2019-07-30 14:08:39 +0300) +- [#71](https://github.com/OpusCapita/react-dates/issues/71) Fix input placeholder color (kvolkovich-sc volkovich@scand.com, 2019-07-30 14:08:24 +0300) + [Release 0.5.10](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.10) Mon Jul 29 2019 13:41:42 GMT+0300 (MSK) ======================================================= From d5da96a3f01232cc4700e2e2ae7b387a013866db Mon Sep 17 00:00:00 2001 From: Kirill Volkovich Date: Tue, 30 Jul 2019 14:10:08 +0300 Subject: [PATCH 18/39] Advancing project version to the next development - 0.5.12. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 5e0c7b8e..b0b3236c 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.11", + "version": "0.5.12", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index fe78e8d3..7965fbb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.11", + "version": "0.5.12", "description": "Start write new project with no effort.", "keywords": [ "react", From 7d5bbc89de6e710a1311931e62faa9fdf4242e13 Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:03:42 +0300 Subject: [PATCH 19/39] Releasing version - 0.5.12. [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db27d062..f80c1d7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ +[Release 0.5.12](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.12) Mon Apr 20 2020 09:03:41 GMT+0300 (MSK) +======================================================= + + [Release 0.5.11](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.11) Tue Jul 30 2019 14:10:01 GMT+0300 (MSK) ======================================================= From f195689e72f8755231c578fb537952f611b82649 Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:03:48 +0300 Subject: [PATCH 20/39] Advancing project version to the next development - 0.5.13-SNAPSHOT. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index b0b3236c..5aa42558 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.12", + "version": "0.5.13-SNAPSHOT", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 7965fbb3..b179525f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.12", + "version": "0.5.13-SNAPSHOT", "description": "Start write new project with no effort.", "keywords": [ "react", From 3d450426ff1356dcc01f789504b533992bd01111 Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:01:35 +0300 Subject: [PATCH 21/39] Lowering z-index of reset button (3 -> 2) --- src/client/components/DateInput/DateInput.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/components/DateInput/DateInput.less b/src/client/components/DateInput/DateInput.less index 7cfde9c3..4c09a6ec 100644 --- a/src/client/components/DateInput/DateInput.less +++ b/src/client/components/DateInput/DateInput.less @@ -72,5 +72,5 @@ position: absolute; top: 0; right: 1ch; - z-index: 3; + z-index: 2; } From a2e044beaeb569e335278d7425d070fe488ba991 Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:23:41 +0300 Subject: [PATCH 22/39] Releasing version - 0.5.13. [ci skip] --- CHANGELOG.md | 5 +++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f80c1d7f..ede57c5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.13](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.13) Mon Apr 20 2020 09:23:41 GMT+0300 (MSK) +======================================================= + +- Lowering z-index of reset button (3 -> 2) (Alexey Sergeev alexey.sergeev@opuscapita.com, 2020-04-20 09:01:35 +0300) + [Release 0.5.12](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.12) Mon Apr 20 2020 09:03:41 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 5aa42558..58a8a6d5 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.13-SNAPSHOT", + "version": "0.5.13", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index b179525f..c2f6b998 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.13-SNAPSHOT", + "version": "0.5.13", "description": "Start write new project with no effort.", "keywords": [ "react", From aeb679a64ae46cb724b5c6d5b5f4d81a36aa83bc Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:23:47 +0300 Subject: [PATCH 23/39] Advancing project version to the next development - 0.5.14-SNAPSHOT. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 58a8a6d5..a9bef09c 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.13", + "version": "0.5.14-SNAPSHOT", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index c2f6b998..18f2406f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.13", + "version": "0.5.14-SNAPSHOT", "description": "Start write new project with no effort.", "keywords": [ "react", From b4d35321e40aa98de8c183628edf2eb4901a7e0f Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:33:02 +0300 Subject: [PATCH 24/39] Adjusting build process [skip ci] --- .circleci/config.yml | 102 +++++++------------------------------------ 1 file changed, 15 insertions(+), 87 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 685f9767..1a1955a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,43 +3,9 @@ defaults: &defaults - image: opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u131-nodejs-8.9.4-maven-3.3.9 working_directory: ~/build -version: 2 +version: 2.1 jobs: - build: - <<: *defaults - steps: - - run: - name: Environment inject. - command: env_inject.sh - - - checkout - - restore_cache: - keys: - - react-showroom-{{ .Branch }}-{{ checksum "package.json" }} - - react-showroom-{{ .Branch }} - - react-showroom - - - run: - name: Installing dependencies. - command: npm install - - - save_cache: - key: react-showroom-{{ .Branch }}-{{ checksum "package.json" }} - paths: - - ./node_modules - - ./package-lock.json - - ./yarn.lock - - - run: - name: Running lint. - command: npm run lint - - - run: - name: Running tests. - command: npm test - update-gh-pages: - docker: <<: *defaults steps: - run: @@ -55,13 +21,12 @@ jobs: - run: name: "Installing dependencies." - command: yarn install + command: npm install - save_cache: key: react-showroom-{{ .Branch }}-{{ checksum "package.json" }} paths: - ./node_modules - - ./yarn.lock - run: name: build-gh-pages @@ -70,79 +35,42 @@ jobs: - run: name: deploy-gh-pages command: ./scripts/gh-pages/deploy.sh .gh-pages-tmp - build_release: + build: <<: *defaults steps: - run: name: Environment inject command: /bin/env_inject.sh - - checkout - - restore_cache: keys: - react-showroom-{{ .Branch }}-{{ checksum "package.json" }} - react-showroom-{{ .Branch }} - react-showroom - - - run: - name: "Installing dependencies." - command: yarn install - + - run: npm install - save_cache: key: react-showroom-{{ .Branch }}-{{ checksum "package.json" }} paths: - ./node_modules - - ./yarn.lock - - - run: - name: "Running lint." - command: npm run lint - - - run: - name: "Deploy." - command: npm run publish-release - - - release: - <<: *defaults - steps: - - - run: - name: Environment inject - command: env_inject.sh - - - checkout - + - run: npm run lint - run: - name: Executing release scrtipt. - command: .circleci/release.sh + name: Publish package + command: | + # we do it only if tag is here (release process is run) + if [ ! -z "${CIRCLE_TAG}" ]; then + npm run publish-release + fi workflows: - version: 2 + version: 2.1 release-and-build: jobs: - - release: - filters: - branches: - only: release - build: filters: + tags: + only: /.*/ branches: - ignore: - - gh-pages - - release + only: /.*/ - update-gh-pages: requires: - build - filters: - branches: - ignore: - - gh-pages - - release - - build_release: - filters: - tags: - only: /.*/ - branches: - ignore: /.*/ From 4d37dc2b725497c37f012910125959687e042788 Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:34:48 +0300 Subject: [PATCH 25/39] Releasing version - 0.5.14. [ci skip] --- CHANGELOG.md | 5 +++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ede57c5a..5ef317db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.14](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.14) Mon Apr 20 2020 09:34:48 GMT+0300 (MSK) +======================================================= + +- Adjusting build process [skip ci] (Alexey Sergeev alexey.sergeev@opuscapita.com, 2020-04-20 09:33:02 +0300) + [Release 0.5.13](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.13) Mon Apr 20 2020 09:23:41 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index a9bef09c..6bba8a8d 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.14-SNAPSHOT", + "version": "0.5.14", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 18f2406f..bb31b4ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.14-SNAPSHOT", + "version": "0.5.14", "description": "Start write new project with no effort.", "keywords": [ "react", From 4012a2ec794d30b0c82824c06526cc4f21a09adc Mon Sep 17 00:00:00 2001 From: Alexey Sergeev Date: Mon, 20 Apr 2020 09:34:55 +0300 Subject: [PATCH 26/39] Advancing project version to the next development - 0.5.15-SNAPSHOT. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 6bba8a8d..025f2c29 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.14", + "version": "0.5.15-SNAPSHOT", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index bb31b4ff..8e9d171e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.14", + "version": "0.5.15-SNAPSHOT", "description": "Start write new project with no effort.", "keywords": [ "react", From 0be5ecdf6a1bb64477c90913853680a3db7a16b3 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Thu, 7 May 2020 16:14:10 +0300 Subject: [PATCH 27/39] Update CI image to opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u192-nodejs-8.17.0-maven-3.3.9 [ci skip] According to https://github.com/OpusCapita/minsk-core/issues/44 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a1955a3..b84cf178 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults docker: - - image: opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u131-nodejs-8.9.4-maven-3.3.9 + - image: opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u192-nodejs-8.17.0-maven-3.3.9 working_directory: ~/build version: 2.1 From 002b8f648fbdd15bb4ac95df460a1742877f905d Mon Sep 17 00:00:00 2001 From: Alexandr Shestak Date: Wed, 10 Mar 2021 16:02:04 +0300 Subject: [PATCH 28/39] (EPROC-20252) Added circleci builds jira integration --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b84cf178..a6ba5527 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,10 @@ defaults: &defaults working_directory: ~/build version: 2.1 + +orbs: + jira: circleci/jira@1.2.2 + jobs: update-gh-pages: <<: *defaults @@ -71,6 +75,8 @@ workflows: only: /.*/ branches: only: /.*/ + post-steps: + - jira/notify - update-gh-pages: requires: - build From d2df82a6385177620481641bfa2ecabba77fee15 Mon Sep 17 00:00:00 2001 From: Alexandr Shestak Date: Tue, 6 Apr 2021 13:09:04 +0300 Subject: [PATCH 29/39] (EPROC-20383) Used jdk zulu --- .circleci/config.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6ba5527..0ebf7323 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults docker: - - image: opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u192-nodejs-8.17.0-maven-3.3.9 + - image: opuscapita/minsk-core-ci:4 working_directory: ~/build version: 2.1 @@ -9,13 +9,15 @@ orbs: jira: circleci/jira@1.2.2 jobs: + init: + docker: + - image: opuscapita/minsk-core-machineuser-env:2 + steps: + - run: circle_ci_add_env.sh + update-gh-pages: <<: *defaults steps: - - run: - name: Environment inject - command: /bin/env_inject.sh - - checkout - restore_cache: keys: @@ -23,6 +25,8 @@ jobs: - react-showroom-{{ .Branch }} - react-showroom + - run: if [ -f /.dockerenv ]; then configure-maven.sh && configure-grails.sh && configure-npm.sh; fi + - run: name: "Installing dependencies." command: npm install @@ -42,15 +46,13 @@ jobs: build: <<: *defaults steps: - - run: - name: Environment inject - command: /bin/env_inject.sh - checkout - restore_cache: keys: - react-showroom-{{ .Branch }}-{{ checksum "package.json" }} - react-showroom-{{ .Branch }} - react-showroom + - run: if [ -f /.dockerenv ]; then configure-maven.sh && configure-grails.sh && configure-npm.sh; fi - run: npm install - save_cache: key: react-showroom-{{ .Branch }}-{{ checksum "package.json" }} @@ -69,12 +71,18 @@ workflows: version: 2.1 release-and-build: jobs: + - init: + filters: + tags: + only: /.*/ - build: filters: tags: only: /.*/ branches: only: /.*/ + requires: + - init post-steps: - jira/notify - update-gh-pages: From bd56bd4b45dcc211dab52675a93005bcf8156cf3 Mon Sep 17 00:00:00 2001 From: Alexandr Shestak Date: Tue, 6 Apr 2021 16:28:54 +0300 Subject: [PATCH 30/39] (EPROC-20383) Used jdk zulu --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ebf7323..3899ca2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: docker: - image: opuscapita/minsk-core-machineuser-env:2 steps: - - run: circle_ci_add_env.sh + - run: circle_ci_add_env.sh GH_MAIL GH_NAME update-gh-pages: <<: *defaults From a2c7c4a58d7e5aa5950f20a293fc28b980d63796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vital?= Date: Fri, 30 Apr 2021 00:56:43 -0500 Subject: [PATCH 31/39] Added Spanish to available languages (#75) --- src/client/dayjs/index.js | 2 ++ src/client/dayjs/locales/es.js | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/client/dayjs/locales/es.js diff --git a/src/client/dayjs/index.js b/src/client/dayjs/index.js index 739df2b5..8a86041b 100644 --- a/src/client/dayjs/index.js +++ b/src/client/dayjs/index.js @@ -1,5 +1,6 @@ import dayjs from 'dayjs'; import en from './locales/en'; +import es from './locales/es'; import de from './locales/de'; import fi from './locales/fi'; import no from './locales/no'; @@ -8,6 +9,7 @@ import sv from './locales/sv'; const locales = { en, + es, de, fi, no, diff --git a/src/client/dayjs/locales/es.js b/src/client/dayjs/locales/es.js new file mode 100644 index 00000000..041aade4 --- /dev/null +++ b/src/client/dayjs/locales/es.js @@ -0,0 +1,12 @@ +export default { + name: 'es', + weekdays: 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'), + months: 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'), + ordinal: n => `${n}°`, + // https://github.com/moment/moment/blob/develop/locale/es.js + weekdaysMin: 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'), + week: { + dow: 1, // Monday is the first day of the week. + doy: 4 // The week that contains Jan 4th is the first week of the year. + } +} From 09702c5891c29120cdfed6397cbf6f87ffc5adb6 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Fri, 30 Apr 2021 08:58:08 +0300 Subject: [PATCH 32/39] Releasing version - 0.5.15. [ci skip] --- CHANGELOG.md | 9 +++++++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef317db..ae8f45e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ +[Release 0.5.15](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.15) Fri Apr 30 2021 08:58:08 GMT+0300 (MSK) +======================================================= + +- Added Spanish to available languages ([#75](https://github.com/OpusCapita/react-dates/issues/75)) (GitHub santiago_vital@outlook.com, 2021-04-30 00:56:43 -0500) +- (EPROC-20383) Used jdk zulu (GitHub ashestak-sc@users.noreply.github.com, 2021-04-06 16:28:54 +0300) +- (EPROC-20383) Used jdk zulu (GitHub ashestak-sc@users.noreply.github.com, 2021-04-06 13:09:04 +0300) +- (EPROC-20252) Added circleci builds jira integration (GitHub ashestak-sc@users.noreply.github.com, 2021-03-10 16:02:04 +0300) +- Update CI image to opuscapita/minsk-core-ci:grails-2.4.4-jdk-8u192-nodejs-8.17.0-maven-3.3.9 [ci skip] (Egor Stambakio egor.stambakio@opuscapita.com, 2020-05-07 16:14:10 +0300) + [Release 0.5.14](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.14) Mon Apr 20 2020 09:34:48 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index 025f2c29..f0f0eb7c 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.15-SNAPSHOT", + "version": "0.5.15", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 8e9d171e..4233b372 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.15-SNAPSHOT", + "version": "0.5.15", "description": "Start write new project with no effort.", "keywords": [ "react", From 2618db17ba2058f4064b3f9a13db4fb8443d7fe4 Mon Sep 17 00:00:00 2001 From: Egor Stambakio Date: Fri, 30 Apr 2021 08:58:12 +0300 Subject: [PATCH 33/39] Advancing project version to the next development - 0.5.16. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index f0f0eb7c..ae001910 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.15", + "version": "0.5.16", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 4233b372..0cc080cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.15", + "version": "0.5.16", "description": "Start write new project with no effort.", "keywords": [ "react", From 8ce4a57e67698333c1c64b67b5e6a18e1e86960f Mon Sep 17 00:00:00 2001 From: Dmitriy Sanko Date: Thu, 24 Jun 2021 12:52:56 +0300 Subject: [PATCH 34/39] (EPROC-20549) Make translation keys unique (#77) --- CHANGELOG.md | 5 + .../jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- .../components/DateInput/DateInput.react.js | 8 +- .../DateRangeInput/DateRangeInput.react.js | 16 +- .../components/DayPicker/DayPicker.react.js | 2 +- src/client/components/translations.js | 138 +++++++++--------- 7 files changed, 86 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8f45e3..8261210f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.16-EPROC-20549-SNAPSHOT](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.16-EPROC-20549-SNAPSHOT) Thu Jun 10 2021 10:30:28 GMT+0300 (MSK) +======================================================= + +- Make translation keys unique (Dmitriy Sanko dmitriy.sanko@opuscapita.com, 2021-06-10 10:19:00 +0300) + [Release 0.5.15](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.15) Fri Apr 30 2021 08:58:08 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index ae001910..eb3e3374 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.16", + "version": "0.5.16-EPROC-20549-SNAPSHOT-2", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 0cc080cf..9b49187f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.16", + "version": "0.5.16-EPROC-20549-SNAPSHOT-2", "description": "Start write new project with no effort.", "keywords": [ "react", diff --git a/src/client/components/DateInput/DateInput.react.js b/src/client/components/DateInput/DateInput.react.js index cfb79a37..9fdf89ea 100644 --- a/src/client/components/DateInput/DateInput.react.js +++ b/src/client/components/DateInput/DateInput.react.js @@ -51,15 +51,15 @@ let defaultProps = { value: null, variants: [ { - getLabel: (locale) => getMessage(locale, 'yesterday'), + getLabel: (locale) => getMessage(locale, 'common.DateInput.yesterday'), getValue: (locale) => dayjs().locale(locale).subtract(1, 'days').toDate() }, { - getLabel: (locale) => getMessage(locale, 'today'), + getLabel: (locale) => getMessage(locale, 'common.DateInput.today'), getValue: (locale) => dayjs().locale(locale).toDate() }, { - getLabel: (locale) => getMessage(locale, 'tomorrow'), + getLabel: (locale) => getMessage(locale, 'common.DateInput.tomorrow'), getValue: (locale) => dayjs().locale(locale).add(1, 'days').toDate() } ] @@ -290,7 +290,7 @@ ${showToTopClassName} ${showToLeftClassName} tabIndex="-1" onClick={this.handleReset} disabled={disabled} - title={getMessage(locale, 'clearValue')} + title={getMessage(locale, 'common.DateInput.clearValue')} > ✕ diff --git a/src/client/components/DateRangeInput/DateRangeInput.react.js b/src/client/components/DateRangeInput/DateRangeInput.react.js index 677cf1eb..627ecc23 100644 --- a/src/client/components/DateRangeInput/DateRangeInput.react.js +++ b/src/client/components/DateRangeInput/DateRangeInput.react.js @@ -65,7 +65,7 @@ let defaultProps = { value: [null, null], variants: [ { - getLabel: (locale) => getMessage(locale, 'previousWeek'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.previousWeek'), // TODO remove ternary operator below. Monitor this issue: https://github.com/iamkun/dayjs/issues/215 getValue: (locale) => locale === 'en' ? [ dayjs().locale(locale).subtract(7, 'days').startOf('week').toDate(), @@ -76,7 +76,7 @@ let defaultProps = { ] }, { - getLabel: (locale) => getMessage(locale, 'thisWeek'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.thisWeek'), // TODO remove ternary operator below. Monitor this issue: https://github.com/iamkun/dayjs/issues/215 getValue: (locale) => locale === 'en' ? [ dayjs().locale(locale).startOf('week').toDate(), @@ -87,7 +87,7 @@ let defaultProps = { ] }, { - getLabel: (locale) => getMessage(locale, 'nextWeek'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.nextWeek'), // TODO remove ternary operator below. Monitor this issue: https://github.com/iamkun/dayjs/issues/215 getValue: (locale) => locale === 'en' ? [ dayjs().locale(locale).add(7, 'days').startOf('week').toDate(), @@ -98,28 +98,28 @@ let defaultProps = { ] }, { - getLabel: (locale) => getMessage(locale, 'previousMonth'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.previousMonth'), getValue: (locale) => [ dayjs().locale(locale).subtract(1, 'month').startOf('month').toDate(), dayjs().locale(locale).subtract(1, 'month').endOf('month').toDate() ] }, { - getLabel: (locale) => getMessage(locale, 'last30Days'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.last30Days'), getValue: (locale) => [ dayjs().locale(locale).subtract(30, 'days').toDate(), dayjs().locale(locale).toDate() ] }, { - getLabel: (locale) => getMessage(locale, 'thisMonth'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.thisMonth'), getValue: (locale) => [ dayjs().locale(locale).startOf('month').toDate(), dayjs().locale(locale).endOf('month').toDate() ] }, { - getLabel: (locale) => getMessage(locale, 'nextMonth'), + getLabel: (locale) => getMessage(locale, 'common.DateRangeInput.nextMonth'), getValue: (locale) => [ dayjs().locale(locale).add(1, 'month').startOf('month').toDate(), dayjs().locale(locale).add(1, 'month').endOf('month').toDate() @@ -443,7 +443,7 @@ class DateRangeInput extends Component { tabIndex="-1" onClick={this.handleReset} disabled={disabled} - title={getMessage(locale, 'clearValue')} + title={getMessage(locale, 'common.DateInput.clearValue')} > ✕ diff --git a/src/client/components/DayPicker/DayPicker.react.js b/src/client/components/DayPicker/DayPicker.react.js index fdf1e87f..306f5cba 100644 --- a/src/client/components/DayPicker/DayPicker.react.js +++ b/src/client/components/DayPicker/DayPicker.react.js @@ -23,7 +23,7 @@ let propTypes = { let defaultProps = { className: '', dayPickerRef: () => {}, - getTodayButtonLabel: (locale) => getMessage(locale, 'today'), + getTodayButtonLabel: (locale) => getMessage(locale, 'common.DateInput.today'), hideTodayButton: false, isRange: false, labels: ReactDayPicker.defaultProps.labels, diff --git a/src/client/components/translations.js b/src/client/components/translations.js index ee238e1e..d7a98143 100644 --- a/src/client/components/translations.js +++ b/src/client/components/translations.js @@ -1,87 +1,81 @@ const translations = { en: { - selectDateRange: 'Select date range', - today: 'Today', - yesterday: 'Yesterday', - tomorrow: 'Tomorrow', - previousWeek: 'Previous week', - nextWeek: 'Next week', - thisWeek: 'This week', - previousMonth: 'Previous month', - last30Days: 'Last 30 days', - thisMonth: 'This month', - nextMonth: 'Next month', - clearValue: 'Clear value' + 'common.DateInput.today': 'Today', + 'common.DateInput.yesterday': 'Yesterday', + 'common.DateInput.tomorrow': 'Tomorrow', + 'common.DateRangeInput.previousWeek': 'Previous week', + 'common.DateRangeInput.nextWeek': 'Next week', + 'common.DateRangeInput.thisWeek': 'This week', + 'common.DateRangeInput.previousMonth': 'Previous month', + 'common.DateRangeInput.last30Days': 'Last 30 days', + 'common.DateRangeInput.thisMonth': 'This month', + 'common.DateRangeInput.nextMonth': 'Next month', + 'common.DateInput.clearValue': 'Clear value' }, de: { - selectDateRange: 'Datumsbereich auswählen', - today: 'Heute', - yesterday: 'Gestern', - tomorrow: 'Morgen', - previousWeek: 'Vorherige Woche', - nextWeek: 'Nächste Woche', - thisWeek: 'Diese Woche', - previousMonth: 'Vorheriger Monat', - last30Days: 'Letzte 30 Tagen', - thisMonth: 'Dieser Monat', - nextMonth: 'Nächster Monat', - clearValue: 'Inhalt löschen' + 'common.DateInput.today': 'Heute', + 'common.DateInput.yesterday': 'Gestern', + 'common.DateInput.tomorrow': 'Morgen', + 'common.DateRangeInput.previousWeek': 'Vorherige Woche', + 'common.DateRangeInput.nextWeek': 'Nächste Woche', + 'common.DateRangeInput.thisWeek': 'Diese Woche', + 'common.DateRangeInput.previousMonth': 'Vorheriger Monat', + 'common.DateRangeInput.last30Days': 'Letzte 30 Tagen', + 'common.DateRangeInput.thisMonth': 'Dieser Monat', + 'common.DateRangeInput.nextMonth': 'Nächster Monat', + 'common.DateInput.clearValue': 'Inhalt löschen' }, ru: { - selectDateRange: 'Выберите диапазон дат', - today: 'Сегодня', - yesterday: 'Вчера', - tomorrow: 'Завтра', - previousWeek: 'Предыдущая неделя', - nextWeek: 'Следующая неделя', - thisWeek: 'Эта неделя', - previousMonth: 'Предыдущий месяц', - last30Days: 'Последние 30 дней', - thisMonth: 'Этот месяц', - nextMonth: 'Следующий месяц', - clearValue: '' + 'common.DateInput.today': 'Сегодня', + 'common.DateInput.yesterday': 'Вчера', + 'common.DateInput.tomorrow': 'Завтра', + 'common.DateRangeInput.previousWeek': 'Предыдущая неделя', + 'common.DateRangeInput.nextWeek': 'Следующая неделя', + 'common.DateRangeInput.thisWeek': 'Эта неделя', + 'common.DateRangeInput.previousMonth': 'Предыдущий месяц', + 'common.DateRangeInput.last30Days': 'Последние 30 дней', + 'common.DateRangeInput.thisMonth': 'Этот месяц', + 'common.DateRangeInput.nextMonth': 'Следующий месяц', + 'common.DateInput.clearValue': '' }, fi: { - selectDateRange: 'Valitse päivämääräväli', - today: 'Tänään', - yesterday: 'Eilen', - tomorrow: 'Huomenna', - previousWeek: 'Edellinen viikko', - nextWeek: 'Seuraava viikko', - thisWeek: 'Tämä viikko', - previousMonth: 'Edellinen kuukausi', - last30Days: 'Edelliset 30 päivää', - thisMonth: 'Tämä kuukausi', - nextMonth: 'Seuraava kuukausi', - clearValue: '' + 'common.DateInput.today': 'Tänään', + 'common.DateInput.yesterday': 'Eilen', + 'common.DateInput.tomorrow': 'Huomenna', + 'common.DateRangeInput.previousWeek': 'Edellinen viikko', + 'common.DateRangeInput.nextWeek': 'Seuraava viikko', + 'common.DateRangeInput.thisWeek': 'Tämä viikko', + 'common.DateRangeInput.previousMonth': 'Edellinen kuukausi', + 'common.DateRangeInput.last30Days': 'Edelliset 30 päivää', + 'common.DateRangeInput.thisMonth': 'Tämä kuukausi', + 'common.DateRangeInput.nextMonth': 'Seuraava kuukausi', + 'common.DateInput.clearValue': '' }, no: { - selectDateRange: 'Velg datoområde', - today: 'I dag', - yesterday: 'I går', - tomorrow: 'I morgen', - previousWeek: 'Forrige uke', - nextWeek: 'Neste uke', - thisWeek: 'Denne uken', - previousMonth: 'Foregående måned', - last30Days: 'Siste 30 dager', - thisMonth: 'Denne måneden', - nextMonth: 'Neste måned', - clearValue: '' + 'common.DateInput.today': 'I dag', + 'common.DateInput.yesterday': 'I går', + 'common.DateInput.tomorrow': 'I morgen', + 'common.DateRangeInput.previousWeek': 'Forrige uke', + 'common.DateRangeInput.nextWeek': 'Neste uke', + 'common.DateRangeInput.thisWeek': 'Denne uken', + 'common.DateRangeInput.previousMonth': 'Foregående måned', + 'common.DateRangeInput.last30Days': 'Siste 30 dager', + 'common.DateRangeInput.thisMonth': 'Denne måneden', + 'common.DateRangeInput.nextMonth': 'Neste måned', + 'common.DateInput.clearValue': '' }, sv: { - selectDateRange: 'Välj datumintervall', - today: 'Idag', - yesterday: 'Igår', - tomorrow: 'Imorgon', - previousWeek: 'Föregående vecka', - nextWeek: 'Nästa vecka', - thisWeek: 'Denna vecka', - previousMonth: 'Föregående månad', - last30Days: 'SSenaste 30 dagarna', - thisMonth: 'Denna månad', - nextMonth: 'Nästa månad', - clearValue: '' + 'common.DateInput.today': 'Idag', + 'common.DateInput.yesterday': 'Igår', + 'common.DateInput.tomorrow': 'Imorgon', + 'common.DateRangeInput.previousWeek': 'Föregående vecka', + 'common.DateRangeInput.nextWeek': 'Nästa vecka', + 'common.DateRangeInput.thisWeek': 'Denna vecka', + 'common.DateRangeInput.previousMonth': 'Föregående månad', + 'common.DateRangeInput.last30Days': 'SSenaste 30 dagarna', + 'common.DateRangeInput.thisMonth': 'Denna månad', + 'common.DateRangeInput.nextMonth': 'Nästa månad', + 'common.DateInput.clearValue': '' } }; From 75b6961bd66318f25d7e29851f58a6d1ce41385f Mon Sep 17 00:00:00 2001 From: ocmachineuser <29400948+ocmachineuser@users.noreply.github.com> Date: Thu, 24 Jun 2021 15:03:39 +0300 Subject: [PATCH 35/39] Releasing version - 0.5.16. [ci skip] --- CHANGELOG.md | 5 +++++ external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8261210f..9a4e1091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +[Release 0.5.16](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.16) Thu Jun 24 2021 15:03:39 GMT+0300 (MSK) +======================================================= + +- (EPROC-20549) Make translation keys unique ([#77](https://github.com/OpusCapita/react-dates/issues/77)) (GitHub dsanko-sc@users.noreply.github.com, 2021-06-24 12:52:56 +0300) + [Release 0.5.16-EPROC-20549-SNAPSHOT](https://github.com/OpusCapita/react-dates/releases/tag/v0.5.16-EPROC-20549-SNAPSHOT) Thu Jun 10 2021 10:30:28 GMT+0300 (MSK) ======================================================= diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index eb3e3374..ae001910 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.16-EPROC-20549-SNAPSHOT-2", + "version": "0.5.16", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 9b49187f..0cc080cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.16-EPROC-20549-SNAPSHOT-2", + "version": "0.5.16", "description": "Start write new project with no effort.", "keywords": [ "react", From ddb36892c9101401b81b74b3df23ee1168c77e70 Mon Sep 17 00:00:00 2001 From: ocmachineuser <29400948+ocmachineuser@users.noreply.github.com> Date: Thu, 24 Jun 2021 15:03:44 +0300 Subject: [PATCH 36/39] Advancing project version to the next development - 0.5.17. [ci skip] --- external_modules/jcatalog-bootstrap/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external_modules/jcatalog-bootstrap/package.json b/external_modules/jcatalog-bootstrap/package.json index ae001910..2b19e652 100644 --- a/external_modules/jcatalog-bootstrap/package.json +++ b/external_modules/jcatalog-bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "jcatalog-bootstrap", - "version": "0.5.16", + "version": "0.5.17", "description": "Bootstrap npm module customized for jCatalog.", "main": "dist/js/bootstrap.min.js", "files": [ diff --git a/package.json b/package.json index 0cc080cf..1813d723 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opuscapita/react-dates", - "version": "0.5.16", + "version": "0.5.17", "description": "Start write new project with no effort.", "keywords": [ "react", From 4d770adc04939729acf1acff10bc2fd6d8526d2e Mon Sep 17 00:00:00 2001 From: Alexandr Shestak Date: Tue, 22 Mar 2022 11:51:57 +0300 Subject: [PATCH 37/39] (EPROC-21097) Improved env variables setting --- .circleci/config.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3899ca2f..dbb563ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,11 +13,19 @@ jobs: docker: - image: opuscapita/minsk-core-machineuser-env:2 steps: - - run: circle_ci_add_env.sh GH_MAIL GH_NAME + - run: generate_bash_env_exports.sh CIRCLE_CI_TOKEN > ~/generated_bash_env + - persist_to_workspace: + root: ~/ + paths: + - generated_bash_env + GH_MAIL GH_NAME update-gh-pages: <<: *defaults steps: + - attach_workspace: + at: /workspace + - run: cat /workspace/generated_bash_env >> $BASH_ENV - checkout - restore_cache: keys: @@ -46,6 +54,9 @@ jobs: build: <<: *defaults steps: + - attach_workspace: + at: /workspace + - run: cat /workspace/generated_bash_env >> $BASH_ENV - checkout - restore_cache: keys: @@ -84,7 +95,9 @@ workflows: requires: - init post-steps: - - jira/notify + - jira/notify: + token_name: "CIRCLE_CI_TOKEN" + - update-gh-pages: requires: - build From 74c290fa1b0bb852ff3cb8c72a2a7f867e14536d Mon Sep 17 00:00:00 2001 From: Alexandr Shestak Date: Tue, 22 Mar 2022 12:11:53 +0300 Subject: [PATCH 38/39] (EPROC-21097) Improved env variables setting --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dbb563ff..acd654a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,12 +13,11 @@ jobs: docker: - image: opuscapita/minsk-core-machineuser-env:2 steps: - - run: generate_bash_env_exports.sh CIRCLE_CI_TOKEN > ~/generated_bash_env + - run: generate_bash_env_exports.sh GH_MAIL GH_NAME CIRCLE_CI_TOKEN > ~/generated_bash_env - persist_to_workspace: root: ~/ paths: - generated_bash_env - GH_MAIL GH_NAME update-gh-pages: <<: *defaults From 96d0597499d90aedc6f22ea3d592060f35b5a2d8 Mon Sep 17 00:00:00 2001 From: Artur Szwed <114471701+arturszwed-oc@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:16:39 +0200 Subject: [PATCH 39/39] EPROC-21769 Update jira orb to 2.0 [skip ci] --- .circleci/config.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acd654a0..9f917c56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,29 @@ +aliases: + - &docker_auth + auth: + username: ${DOCKER_USER} + password: ${DOCKER_PASS} + + - &default-context + context: + - shared-creds + defaults: &defaults docker: - image: opuscapita/minsk-core-ci:4 + <<: *docker_auth working_directory: ~/build version: 2.1 orbs: - jira: circleci/jira@1.2.2 + jira: circleci/jira@2.0 jobs: init: docker: - image: opuscapita/minsk-core-machineuser-env:2 + <<: *docker_auth steps: - run: generate_bash_env_exports.sh GH_MAIL GH_NAME CIRCLE_CI_TOKEN > ~/generated_bash_env - persist_to_workspace: @@ -82,10 +94,12 @@ workflows: release-and-build: jobs: - init: + <<: *default-context filters: tags: only: /.*/ - build: + <<: *default-context filters: tags: only: /.*/ @@ -95,8 +109,10 @@ workflows: - init post-steps: - jira/notify: - token_name: "CIRCLE_CI_TOKEN" + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> - update-gh-pages: + <<: *default-context requires: - build