Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

rg-future (rebased) #3830

Merged
merged 50 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
7cf8263
fix: remove the DigitizeButton
dnlkoch Sep 4, 2023
ce5bdb7
refactor: remove deprecated HOC components
annarieger Sep 4, 2023
27aeb34
chore: update several dependencies
dnlkoch Sep 4, 2023
73e975f
build: config updates
dnlkoch Sep 4, 2023
7610634
build: update enzyme adapter
dnlkoch Sep 4, 2023
c0cffa8
fix: make use of dayjs, don't pass icon prop in LayerTreeNode
dnlkoch Sep 4, 2023
c749faa
refactor: remove Panel, Window and Titlebar components
annarieger Sep 4, 2023
3fe4ce2
feat: remove toolbar and user chip component
annarieger Sep 5, 2023
7dba4ad
chore: homogenize / sort imports using simple-sort-plugin
ahennr Sep 6, 2023
7d2e6cf
refactor: factor out some code to react-util and use it (#3498)
hwbllmnn Sep 6, 2023
74b7587
refactor: transform to react fc
annarieger Sep 6, 2023
2711a63
fix: adjust to breaking changes in latest version of react-util
dnlkoch Oct 24, 2023
ddc8e7d
chore: disable failing test, see #3142
dnlkoch Oct 24, 2023
fc1ff8c
chore: update to ol 8 api
dnlkoch Oct 24, 2023
a182130
build: cleanup ignore patterns
dnlkoch Oct 24, 2023
261ea52
fix: adjust to change Key type in @types/react
dnlkoch Oct 24, 2023
4ea49cf
chore: update dependencies
dnlkoch Oct 24, 2023
f646ed5
chore: refactor geolocation button
ahennr Sep 12, 2023
bd8812f
chore: migrate to typescript v5
ahennr Feb 16, 2024
14760f0
refactor: simplify the ToggleButton and ToggleGroup components
dnlkoch Feb 16, 2024
2515987
chore: update dependencies
dnlkoch Feb 16, 2024
c7201b4
chore: fix lint & typescript errors and warnings
dnlkoch Feb 16, 2024
9a2d062
chore: update workflow to make use of node v20 and don't force depend…
dnlkoch Feb 16, 2024
4e25f56
refactor: to function component
dnlkoch Feb 16, 2024
cd657fe
feat: refactor code into `useDraw` hook
simonseyock Sep 6, 2023
de4c12c
refactor: `CopyButton`, `DeleteButton`, `SelectFeaturesButton` use ho…
simonseyock Sep 6, 2023
03acea0
refactor: modify button uses `useModify` hook
simonseyock Sep 6, 2023
f4c8597
feat: introduce useNominatim hook
ahennr Feb 20, 2024
656e9f7
chore: update react util
ahennr Feb 29, 2024
7dddfce
feat: use coordinateInfo hook
ahennr Feb 16, 2024
741851d
feat: use useProjFromEpsgIO hook
ahennr Feb 19, 2024
106e2c0
fix: simplify regex
ahennr Feb 19, 2024
f2bd3d0
feat: upgraded ol to v9
AmandaTamanda Mar 4, 2024
e0c1107
refactor: timelayersliderpanel to function component
mholthausen Feb 21, 2024
189b0bb
feat: use wfs hook
ahennr Mar 1, 2024
a88b54b
feat: combine WfsSearch and WfsSearchInput to WfsSearchField
ahennr Mar 5, 2024
5a78b77
fix: adds null check
ahennr Mar 11, 2024
7b0732e
fix: made use of olInteraction hook
TreffN Mar 22, 2024
ea48bb3
refactor: components FeatureGrid and AgFeatureGrid to function component
dnlkoch Feb 29, 2024
ef77c9d
feat: adds a flag for transparent background of ToggleButton
mholthausen Apr 29, 2024
19987ed
refactor: move example to function component
dnlkoch Apr 30, 2024
3b13ce1
refactor: class to function component
dnlkoch Apr 30, 2024
a32aee4
feat: readd MapComponent, FloatingMapLogo and BackgroundLayerChooser
dnlkoch May 6, 2024
6b6962b
refactor: make use of useMeasure hook
dnlkoch Apr 30, 2024
e73bfa7
fix: make use of UseMeasureProps
dnlkoch May 2, 2024
aad694f
fix: sets the transparent background to false again
mholthausen May 2, 2024
1c0bec3
feat: adds the onSuccess callback to CoordinateInfo component
mholthausen May 2, 2024
38dabed
feat: adds a wfs layer and feature-info (#3826)
FritzHoing May 6, 2024
f1c758f
fix: readd changes that were lost in rebase
simonseyock May 6, 2024
db6e432
ci: configure next to be a prerelease branch
simonseyock May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
module.exports = {
extends: [
'@terrestris/eslint-config-typescript',
'@terrestris/eslint-config-typescript-react',
'plugin:testing-library/react',
'plugin:jest-dom/recommended'
],
plugins: [
'testing-library',
'jest-dom'
'jest-dom',
'simple-import-sort'
],
rules: {
'no-underscore-dangle': 'off',
'@typescript-eslint/member-ordering': 'off',
'testing-library/no-node-access': 'warn',
'testing-library/no-container': 'warn'
'no-underscore-dangle': 'off',
'simple-import-sort/exports': 'warn',
'simple-import-sort/imports': 'warn'
}
};
10 changes: 7 additions & 3 deletions .eslintrc.styleguide.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ module.exports = {
'markdown'
],
overrides: [{
files: ["**/*.{md,mkdn,mdown,markdown}"],
processor: "markdown/markdown"
files: [
'**/*.{md,mkdn,mdown,markdown}'
],
processor: 'markdown/markdown'
}, {
files: ["**/*.{md,mkdn,mdown,markdown}/*.{js,javascript,jsx,node}"]
files: [
'**/*.{md,mkdn,mdown,markdown}/*.{js,javascript,jsx,node}'
]
}],
env: {
browser: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
with:
persist-credentials: false

- name: Setup Node.js 18 👷🏻
- name: Setup Node.js 👷🏻
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Cache Node.js modules 💾
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
- name: Checkout sources 🔰
uses: actions/checkout@v3

- name: Setup Node.js 18
- name: Setup Node.js 👷🏻
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Cache Node.js modules 💾
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Checkout sources 🔰
uses: actions/checkout@v3

- name: Setup Node.js 18 👷🏻
- name: Setup Node.js 👷🏻
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Cache Node.js modules 💾
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout sources 🔰
uses: actions/checkout@v3

- name: Setup Node.js 18 👷🏻
- name: Setup Node.js 👷🏻
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Install dependencies ⏬
run: npm ci
Expand Down
3 changes: 1 addition & 2 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
v18

v20
5 changes: 4 additions & 1 deletion .releaserc
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"branches": [
"main",
"next",
{
name: "next",
prerelease: true
}
"15.x.x"
],
"plugins": [
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ module.exports = {
},
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-class-properties'
'@babel/plugin-transform-class-properties'
]
};
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
'<rootDir>/dist/'
],
transformIgnorePatterns: [
'node_modules/(?!(ol|antd|d3-selection|@camptocamp/inkmap|(rc-[a-z-]*)|@ant-design\/css-animation|(-[a-z]+)*|@babel\/runtime)/)'
'node_modules/(?!(ol|@camptocamp/inkmap|@terrestris/react-util|d3-selection|color-*[a-z]*)|(rc-*[a-z]*)/)'
],
setupFiles: [
'<rootDir>/jest/__mocks__/matchMediaMock.js'
Expand Down
31 changes: 29 additions & 2 deletions jest/setup.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,35 @@
import Enzyme from 'enzyme';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import 'whatwg-fetch';
import 'jest-canvas-mock';
import '@testing-library/jest-dom';
import 'regenerator-runtime/runtime';

import Adapter from '@cfaester/enzyme-adapter-react-18';
import Enzyme from 'enzyme';
import {
TextDecoder,
TextEncoder
} from 'util';

Object.assign(global, {
TextDecoder,
TextEncoder
});

Enzyme.configure({ adapter: new Adapter() });

jest.mock('use-resize-observer', () => ({
__esModule: true,
default: jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
})),
}));

window.ResizeObserver =
window.ResizeObserver ||
jest.fn().mockImplementation(() => ({
disconnect: jest.fn(),
observe: jest.fn(),
unobserve: jest.fn(),
}));
Loading
Loading