From 309d3ac221dfd9b568a9fb2cea084f6b534bf130 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Wed, 22 Nov 2023 21:31:42 +0530 Subject: [PATCH 1/7] Added Title --- package.json | 16 ++++++++-------- src/components/AgendaResourceEvents.jsx | 3 +-- src/components/ResourceView.jsx | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 060f073..3da2e82 100644 --- a/package.json +++ b/package.json @@ -60,25 +60,25 @@ }, "dependencies": { "@ant-design/icons": "^5.2.6", - "antd": "^5.11.0", + "antd": "^5.11.3", "dayjs": "^1.11.10", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dnd": "^14.0.5", "react-dnd-html5-backend": "^14.1.0", "react-dom": "^18.2.0", - "rrule": "^2.7.2" + "rrule": "^2.8.1" }, "devDependencies": { - "@babel/cli": "^7.23.0", - "@babel/core": "^7.23.2", - "@babel/eslint-parser": "^7.22.15", - "@babel/preset-env": "^7.23.2", - "@babel/preset-react": "^7.22.15", + "@babel/cli": "^7.23.4", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", + "@babel/preset-env": "^7.23.3", + "@babel/preset-react": "^7.23.3", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", - "eslint": "^8.53.0", + "eslint": "^8.54.0", "eslint-config-airbnb": "^19.0.4", "eslint-plugin-import": "^2.29.0", "eslint-plugin-jsx-a11y": "^6.8.0", diff --git a/src/components/AgendaResourceEvents.jsx b/src/components/AgendaResourceEvents.jsx index 8301a30..2315b15 100644 --- a/src/components/AgendaResourceEvents.jsx +++ b/src/components/AgendaResourceEvents.jsx @@ -12,7 +12,6 @@ function AgendaResourceEvents(props) { const end = localeDayjs(endDate).add(1, 'days'); const headerStart = localeDayjs(new Date(item.start)); const headerEnd = localeDayjs(new Date(item.end)); - if (start === headerStart && end === headerEnd) { return item.events.map(evt => { const durationStart = localeDayjs(new Date(startDate)); @@ -36,7 +35,7 @@ function AgendaResourceEvents(props) { ); let slotItem = ( -
+
{slotItemContent}
); diff --git a/src/components/ResourceView.jsx b/src/components/ResourceView.jsx index 549028f..6437ac5 100644 --- a/src/components/ResourceView.jsx +++ b/src/components/ResourceView.jsx @@ -41,7 +41,7 @@ function ResourceView({ schedulerData, contentScrollbarHeight, slotClickedFunc, ); let slotItem = ( -
+
{slotCell}
); From 242122ee31efb384738f16c2fc4449c99ec5183e Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Wed, 22 Nov 2023 21:58:04 +0530 Subject: [PATCH 2/7] Change Package Version and added note for branch. --- CONTRIBUTING.md | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f487e6d..61462f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,6 +10,8 @@ Before you start contributing, please take a moment to read our Code of Conduct. If you're new to the project, it's a good idea to familiarize yourself with the [README.md](https://github.com/react-scheduler/react-big-schedule/blob/master/README.md) file, which provides an overview of the project and its features. Also, explore existing issues and pull requests to understand the ongoing work and discussions. +#### Important Note: The `main` branch is for beta releases, and the `master` branch is for stable releases. When changes are pushed to the `main` branch, a beta version will be released, whereas pushing changes to the `master` branch will trigger a release for the next stable version. + ### How to Contribute We value contributions in various forms – from reporting issues and suggesting improvements to submitting feature requests and providing code changes. To get started with your contributions, follow these steps: @@ -52,4 +54,3 @@ Thank you for taking the time to contribute to react-big-schedule! Your passion #### Happy coding! -- The react-big-schedule Team diff --git a/package.json b/package.json index 3da2e82..bb52488 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-big-schedule", - "version": "4.3.2", + "version": "4.3.3-beta.0", "description": "React Big Schedule is a powerful and intuitive scheduler and resource planning solution built with React. Seamlessly integrate this modern browser-compatible component into your applications to effectively manage time, appointments, and resources. With drag-and-drop functionality, interactive UI, and granular views, react-big-schedule empowers users to effortlessly schedule and allocate resources with precision. Enhance productivity and streamline your workflow with this React-based solution, designed to optimize time management and simplify calendar-based operations. Perfect for applications requiring advanced scheduling capabilities, react-big-schedule offers a seamless and intuitive experience for managing appointments, resource allocation, and time slots. Unlock the potential of your React projects with react-big-schedule and revolutionize the way you handle scheduling and resource planning. It is the updated version of react-big-scheduler", "keywords": [ "react-big-schedule", From 57cedcd66b3cf797aa5159ebb4b5b77f22d1d016 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Wed, 22 Nov 2023 22:03:50 +0530 Subject: [PATCH 3/7] change branch name --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61462f3..e69f0de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Before you start contributing, please take a moment to read our Code of Conduct. If you're new to the project, it's a good idea to familiarize yourself with the [README.md](https://github.com/react-scheduler/react-big-schedule/blob/master/README.md) file, which provides an overview of the project and its features. Also, explore existing issues and pull requests to understand the ongoing work and discussions. -#### Important Note: The `main` branch is for beta releases, and the `master` branch is for stable releases. When changes are pushed to the `main` branch, a beta version will be released, whereas pushing changes to the `master` branch will trigger a release for the next stable version. +#### Important Note: The `master` branch is for beta releases, and the `main` branch is for stable releases. When changes are pushed to the `master` branch, a beta version will be released, whereas pushing changes to the `main` branch will trigger a release for the next stable version. ### How to Contribute From 12cbdee62798d4175858196036ffff8cc98bca62 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Wed, 22 Nov 2023 22:06:05 +0530 Subject: [PATCH 4/7] Fix Styling --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e69f0de..f899bb3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,4 +53,3 @@ If you encounter a bug, have a feature request, or need assistance with the libr Thank you for taking the time to contribute to react-big-schedule! Your passion and effort are what make open-source communities thrive. We value your contributions and look forward to seeing you grow with the project. #### Happy coding! - From 868afff1b2ece70b05ec3258f26379f784d8f5c4 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Wed, 22 Nov 2023 22:20:34 +0530 Subject: [PATCH 5/7] Added Sample Data --- package.json | 2 +- src/components/AgendaResourceEvents.jsx | 2 +- src/components/ResourceView.jsx | 2 +- src/components/SchedulerData.js | 1 + src/sample-data/sample1.js | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bb52488..f832d0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-big-schedule", - "version": "4.3.3-beta.0", + "version": "4.3.3-beta.1", "description": "React Big Schedule is a powerful and intuitive scheduler and resource planning solution built with React. Seamlessly integrate this modern browser-compatible component into your applications to effectively manage time, appointments, and resources. With drag-and-drop functionality, interactive UI, and granular views, react-big-schedule empowers users to effortlessly schedule and allocate resources with precision. Enhance productivity and streamline your workflow with this React-based solution, designed to optimize time management and simplify calendar-based operations. Perfect for applications requiring advanced scheduling capabilities, react-big-schedule offers a seamless and intuitive experience for managing appointments, resource allocation, and time slots. Unlock the potential of your React projects with react-big-schedule and revolutionize the way you handle scheduling and resource planning. It is the updated version of react-big-scheduler", "keywords": [ "react-big-schedule", diff --git a/src/components/AgendaResourceEvents.jsx b/src/components/AgendaResourceEvents.jsx index 2315b15..425410a 100644 --- a/src/components/AgendaResourceEvents.jsx +++ b/src/components/AgendaResourceEvents.jsx @@ -35,7 +35,7 @@ function AgendaResourceEvents(props) { ); let slotItem = ( -
+
{slotItemContent}
); diff --git a/src/components/ResourceView.jsx b/src/components/ResourceView.jsx index 6437ac5..0bd31d5 100644 --- a/src/components/ResourceView.jsx +++ b/src/components/ResourceView.jsx @@ -41,7 +41,7 @@ function ResourceView({ schedulerData, contentScrollbarHeight, slotClickedFunc, ); let slotItem = ( -
+
{slotCell}
); diff --git a/src/components/SchedulerData.js b/src/components/SchedulerData.js index 4913173..25d7b51 100644 --- a/src/components/SchedulerData.js +++ b/src/components/SchedulerData.js @@ -864,6 +864,7 @@ export default class SchedulerData { const slotRenderData = { slotId: slot.id, slotName: slot.name, + slotTitle: slot.title, parentId: slot.parentId, groupOnly: slot.groupOnly, hasSummary: false, diff --git a/src/sample-data/sample1.js b/src/sample-data/sample1.js index 1e37fa1..0a90bf4 100644 --- a/src/sample-data/sample1.js +++ b/src/sample-data/sample1.js @@ -1,7 +1,7 @@ const DemoData = { resources: [ - { id: 'r0', name: 'Resource0', groupOnly: true }, - { id: 'r1', name: 'Resource1', parentId: 'r0' }, + { id: 'r0', name: 'Resource0', title: 'Resource 0', groupOnly: true }, + { id: 'r1', name: 'Resource1', title: 'Resource 1', parentId: 'r0' }, { id: 'r2', name: 'Resource2', parentId: 'r3' }, { id: 'r3', name: 'Resource3', parentId: 'r1' }, { id: 'r4', name: 'Resource4' }, From 84333ec252924b34b6abc48b3caffe5bbe039556 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Sat, 16 Dec 2023 21:51:52 +0530 Subject: [PATCH 6/7] Updated Version --- CHANGELOG.md | 7 +++++++ package.json | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 571b485..2b8ee3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [4.3.3](https://github.com/react-scheduler/react-big-schedule/compare/4.3.2...4.3.3) + +`2023-12-16` + +- Updated `node_modules` version by [@ansulagrawal](https://github.com/ansulagrawal). +- Fix issue [#114](https://github.com/react-scheduler/react-big-schedule/issues/114) displaying `[object Object]` in the title of resources. + ## [4.3.2](https://github.com/react-scheduler/react-big-schedule/compare/4.3.1...4.3.2) `2023-11-06` diff --git a/package.json b/package.json index f832d0b..634696e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-big-schedule", - "version": "4.3.3-beta.1", + "version": "4.3.3", "description": "React Big Schedule is a powerful and intuitive scheduler and resource planning solution built with React. Seamlessly integrate this modern browser-compatible component into your applications to effectively manage time, appointments, and resources. With drag-and-drop functionality, interactive UI, and granular views, react-big-schedule empowers users to effortlessly schedule and allocate resources with precision. Enhance productivity and streamline your workflow with this React-based solution, designed to optimize time management and simplify calendar-based operations. Perfect for applications requiring advanced scheduling capabilities, react-big-schedule offers a seamless and intuitive experience for managing appointments, resource allocation, and time slots. Unlock the potential of your React projects with react-big-schedule and revolutionize the way you handle scheduling and resource planning. It is the updated version of react-big-scheduler", "keywords": [ "react-big-schedule", @@ -60,7 +60,7 @@ }, "dependencies": { "@ant-design/icons": "^5.2.6", - "antd": "^5.11.3", + "antd": "^5.12.2", "dayjs": "^1.11.10", "prop-types": "^15.8.1", "react": "^18.2.0", @@ -71,22 +71,22 @@ }, "devDependencies": { "@babel/cli": "^7.23.4", - "@babel/core": "^7.23.3", + "@babel/core": "^7.23.6", "@babel/eslint-parser": "^7.23.3", - "@babel/preset-env": "^7.23.3", + "@babel/preset-env": "^7.23.6", "@babel/preset-react": "^7.23.3", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", - "eslint": "^8.54.0", + "eslint": "^8.56.0", "eslint-config-airbnb": "^19.0.4", - "eslint-plugin-import": "^2.29.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsx-a11y": "^6.8.0", "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "eslint-webpack-plugin": "^4.0.1", - "fs-extra": "^11.1.1", - "html-webpack-plugin": "^5.5.3", + "fs-extra": "^11.2.0", + "html-webpack-plugin": "^5.5.4", "style-loader": "^3.3.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", From c8257fa76bb57f9136bf8253947a65e200a9ae59 Mon Sep 17 00:00:00 2001 From: Ansul Agrawal Date: Sat, 16 Dec 2023 21:54:31 +0530 Subject: [PATCH 7/7] Fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8ee3f..98cb6a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ `2023-12-16` - Updated `node_modules` version by [@ansulagrawal](https://github.com/ansulagrawal). -- Fix issue [#114](https://github.com/react-scheduler/react-big-schedule/issues/114) displaying `[object Object]` in the title of resources. +- Fix issue [#114](https://github.com/react-scheduler/react-big-schedule/issues/114) displaying `[object Object]` in the title of resources. ## [4.3.2](https://github.com/react-scheduler/react-big-schedule/compare/4.3.1...4.3.2)