diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ccbd52..65c76aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] ### Added -* *Nothing* +* [shlink-web-component#293](https://github.com/shlinkio/shlink-web-component/issues/293) Allow ordering redirect rules via drag'n'drop. ### Changed * Update JS coding standard +* [#1132](https://github.com/shlinkio/shlink-web-client/issues/1132) Add warning message in "validate URLs" setting, indicating it is ignored when consuming Shlink >=4.0.0. ### Deprecated * *Nothing* @@ -18,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), * *Nothing* ### Fixed -* *Nothing* +* [shlink-web-component#294](https://github.com/shlinkio/shlink-web-component/issues/294) Make sure "validate URL" control is not displayed in short URL creation/edition, when consuming Shlink >=4.0.0. ## [4.1.0] - 2024-03-17 diff --git a/package-lock.json b/package-lock.json index 9b966b8a..4e9af298 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@shlinkio/data-manipulation": "^1.0.3", "@shlinkio/shlink-frontend-kit": "^0.5.0", "@shlinkio/shlink-js-sdk": "^1.0.0", - "@shlinkio/shlink-web-component": "^0.6.0", + "@shlinkio/shlink-web-component": "^0.6.1", "bootstrap": "5.2.3", "bottlejs": "^2.0.1", "clsx": "^2.1.0", @@ -2495,6 +2495,11 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@formkit/drag-and-drop": { + "version": "0.0.38", + "resolved": "https://registry.npmjs.org/@formkit/drag-and-drop/-/drag-and-drop-0.0.38.tgz", + "integrity": "sha512-3uJFcqz1xL7x/5pClDnyqEDfyFRDFH+75MFpJYXnVF17oekxLrwbUaOBN7ttKGn1jW2MdojRw4WMnSN1iLryvw==" + }, "node_modules/@fortawesome/fontawesome-common-types": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", @@ -3012,17 +3017,18 @@ "integrity": "sha512-bt6MoXM1pNkeHZ8DquBd6jNNT2T0FWDk3rQCWgPYTFM4Y8oIsC7BLHqYT7/y1DEquqUZTTusAxu9ed3pjcVPGQ==" }, "node_modules/@shlinkio/shlink-web-component": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.6.0.tgz", - "integrity": "sha512-c7glBVYzcStQz+KqL2sEcplx/jLRvH3txU/05C07Sw1DgvBV1pyMhRnKT1oYQKnzvq2gRAaeKP5+iDg44S3BOA==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.6.1.tgz", + "integrity": "sha512-JGEg3xENpsu21O8rSkkGlwmRfu75g8y3uqS7vFKj5TWBhP844yxy7IN7SSkKgaoURU2YUHtVZEgUSTsciKWZ7w==", "dependencies": { + "@formkit/drag-and-drop": "^0.0.38", "@json2csv/plainjs": "^7.0.6", "@shlinkio/data-manipulation": "^1.0.3", "bottlejs": "^2.0.1", "bowser": "^2.11.0", "clsx": "^2.1.0", "compare-versions": "^6.1.0", - "date-fns": "^3.5.0", + "date-fns": "^3.6.0", "event-source-polyfill": "^1.0.31", "leaflet": "^1.9.4", "react-external-link": "^2.2.0", @@ -12721,6 +12727,11 @@ "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true }, + "@formkit/drag-and-drop": { + "version": "0.0.38", + "resolved": "https://registry.npmjs.org/@formkit/drag-and-drop/-/drag-and-drop-0.0.38.tgz", + "integrity": "sha512-3uJFcqz1xL7x/5pClDnyqEDfyFRDFH+75MFpJYXnVF17oekxLrwbUaOBN7ttKGn1jW2MdojRw4WMnSN1iLryvw==" + }, "@fortawesome/fontawesome-common-types": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", @@ -13044,17 +13055,18 @@ "integrity": "sha512-bt6MoXM1pNkeHZ8DquBd6jNNT2T0FWDk3rQCWgPYTFM4Y8oIsC7BLHqYT7/y1DEquqUZTTusAxu9ed3pjcVPGQ==" }, "@shlinkio/shlink-web-component": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.6.0.tgz", - "integrity": "sha512-c7glBVYzcStQz+KqL2sEcplx/jLRvH3txU/05C07Sw1DgvBV1pyMhRnKT1oYQKnzvq2gRAaeKP5+iDg44S3BOA==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.6.1.tgz", + "integrity": "sha512-JGEg3xENpsu21O8rSkkGlwmRfu75g8y3uqS7vFKj5TWBhP844yxy7IN7SSkKgaoURU2YUHtVZEgUSTsciKWZ7w==", "requires": { + "@formkit/drag-and-drop": "^0.0.38", "@json2csv/plainjs": "^7.0.6", "@shlinkio/data-manipulation": "^1.0.3", "bottlejs": "^2.0.1", "bowser": "^2.11.0", "clsx": "^2.1.0", "compare-versions": "^6.1.0", - "date-fns": "^3.5.0", + "date-fns": "^3.6.0", "event-source-polyfill": "^1.0.31", "leaflet": "^1.9.4", "react-external-link": "^2.2.0", diff --git a/package.json b/package.json index 0cf4a03f..bf5ea991 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@shlinkio/data-manipulation": "^1.0.3", "@shlinkio/shlink-frontend-kit": "^0.5.0", "@shlinkio/shlink-js-sdk": "^1.0.0", - "@shlinkio/shlink-web-component": "^0.6.0", + "@shlinkio/shlink-web-component": "^0.6.1", "bootstrap": "5.2.3", "bottlejs": "^2.0.1", "clsx": "^2.1.0", diff --git a/src/settings/ShortUrlCreationSettings.tsx b/src/settings/ShortUrlCreationSettings.tsx index fc240f55..be3692cb 100644 --- a/src/settings/ShortUrlCreationSettings.tsx +++ b/src/settings/ShortUrlCreationSettings.tsx @@ -33,7 +33,8 @@ export const ShortUrlCreationSettings: FC = ({ settings, checked={shortUrlCreation.validateUrls ?? false} onChange={(validateUrls) => setShortUrlCreationSettings({ ...shortUrlCreation, validateUrls })} > - Request validation on long URLs when creating new short URLs. + Request validation on long URLs when creating new short URLs.{' '} + This option is ignored by Shlink {'>='}4.0.0 The initial state of the Validate URL checkbox will be {shortUrlCreation.validateUrls ? 'checked' : 'unchecked'}.