@banch0u/core-project-test-repository 1.4.0 → 1.4.1

package/dist/components/NotificationDropdown/index.js

@@ -1,12 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useCallback, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { readNotification, readNotificationAll } from "../../store/slices/notification";
-import { Button, Form, List, Typography } from "antd";
+import { Button, List, Tooltip, Typography } from "antd";
 import { CheckOutlined, EyeOutlined, SettingOutlined } from "@ant-design/icons";
-import { Modal } from "antd";
 import style from "./index.module.scss";
 import NotificationSettingsContent from "../NotificationSettingsContent";
 import FormModal from "../FormModal";
@@ -17,14 +15,12 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
     setSize = _ref.setSize,
     setPage = _ref.setPage;
   var dispatch = useDispatch();
-  var ref = useRef();
+  var modalRef = useRef(); // ⬅️ Modal ref
+  var contentRef = useRef(); // ⬅️ NotificationSettingsContent ref
+
   var notifications = useSelector(function (state) {
     return state.notification.notifications;
   });
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isSettingsOpen = _useState2[0],
-    setIsSettingsOpen = _useState2[1];
   var notReadenCount = notifications === null || notifications === void 0 ? void 0 : notifications.notReadenCount;
   var totalCount = notifications === null || notifications === void 0 ? void 0 : notifications.totalCount;
   var items = (notifications === null || notifications === void 0 || (_notifications$notifi = notifications.notifications) === null || _notifications$notifi === void 0 ? void 0 : _notifications$notifi.items) || [];
@@ -40,17 +36,13 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
       };
     }
   };
-  var onOpenModal = function onOpenModal() {
-    var _ref$current;
-    ref === null || ref === void 0 || (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.open();
-  };
   var handleRead = function handleRead(id) {
     return dispatch(readNotification({
       id: id
     }));
   };
   var handleReadAll = function handleReadAll() {
-    dispatch(readNotificationAll());
+    return dispatch(readNotificationAll());
   };
   var handleNotificationClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, id) {
@@ -85,7 +77,16 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
   var handleLoadMore = function handleLoadMore() {
     var newSize = size + 20;
     setSize(newSize);
-    setPage(1); // always use page 1 when growing size
+    setPage(1);
+  };
+  var onOpenModal = function onOpenModal() {
+    var _contentRef$current, _contentRef$current$r, _modalRef$current, _modalRef$current$ope;
+    contentRef === null || contentRef === void 0 || (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 || (_contentRef$current$r = _contentRef$current.refresh) === null || _contentRef$current$r === void 0 || _contentRef$current$r.call(_contentRef$current); // ⬅️ Trigger getNotificationSettings()
+    modalRef === null || modalRef === void 0 || (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 || (_modalRef$current$ope = _modalRef$current.open) === null || _modalRef$current$ope === void 0 || _modalRef$current$ope.call(_modalRef$current); // ⬅️ Open modal
+  };
+  var onCloseModal = function onCloseModal() {
+    var _modalRef$current2, _modalRef$current2$cl;
+    modalRef === null || modalRef === void 0 || (_modalRef$current2 = modalRef.current) === null || _modalRef$current2 === void 0 || (_modalRef$current2$cl = _modalRef$current2.close) === null || _modalRef$current2$cl === void 0 || _modalRef$current2$cl.call(_modalRef$current2); // ⬅️ Open modal
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: style.dropdownWrapper
@@ -104,9 +105,7 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
     size: "small",
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
     type: "text",
-    onClick: function onClick() {
-      return onOpenModal();
-    }
+    onClick: onOpenModal
   }))), /*#__PURE__*/React.createElement(List, {
     dataSource: items,
     locale: {
@@ -115,17 +114,19 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
     renderItem: function renderItem(item) {
       var parsed = parseNotification(item.text);
       return /*#__PURE__*/React.createElement(List.Item, {
-        className: "".concat(style.notificationItem, " ").concat(!item.read ? style.unread : ""),
-        actions: [!item.read && /*#__PURE__*/React.createElement(Button, {
+        className: "".concat(style.notificationItem, " ").concat(item.isReaden ? style.read : style.unread),
+        actions: [!item.isReaden && /*#__PURE__*/React.createElement(Tooltip, {
+          title: "Oxu"
+        }, /*#__PURE__*/React.createElement(Button, {
           size: "small",
           type: "link",
           icon: /*#__PURE__*/React.createElement(EyeOutlined, null),
           onClick: function onClick() {
             return handleRead(item.id);
           }
-        })]
+        }))]
       }, /*#__PURE__*/React.createElement(List.Item.Meta, {
-        title: /*#__PURE__*/React.createElement("span", {
+        title: /*#__PURE__*/React.createElement("div", {
           onClick: function onClick() {
             return handleNotificationClick(item.text, item.id);
           },
@@ -151,11 +152,12 @@ var NotificationDropdown = function NotificationDropdown(_ref) {
     type: "text",
     onClick: handleLoadMore
   }, "Daha \xE7ox g\xF6st\u0259r"))), /*#__PURE__*/React.createElement(FormModal, {
-    ref: ref,
+    ref: modalRef,
     width: 695,
     showButtons: false
   }, /*#__PURE__*/React.createElement(NotificationSettingsContent, {
-    ref: ref
+    ref: contentRef,
+    onClose: onCloseModal
   })));
 };
 export default NotificationDropdown;

package/dist/components/NotificationDropdown/index.module.scss

@@ -50,10 +50,13 @@
     background-color: #deeaf5;
   }
 }
-
+.read {
+  background-color: white;
+  font-weight: 500;
+}
 .unread {
   background-color: #f6f6f6;
-  font-weight: 600;
+  font-weight: 700;
 }
 
 .loadMore {

package/dist/components/NotificationSettingsContent/index.js

@@ -1,11 +1,12 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import React, { useCallback, useEffect, useState } from "react";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import React, { useCallback, useEffect, useState, useImperativeHandle } from "react";
 import { Form, Switch, Typography, Row, Col, Select } from "antd";
 import { useDispatch, useSelector } from "react-redux";
 import { editNotificationSettings, getNotificationSettings } from "../../store/slices/notification";
+import { useLocation } from "react-router-dom";
 import style from "./index.module.scss";
 import Button from "../Button";
 var Title = Typography.Title,
@@ -35,10 +36,17 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var dispatch = useDispatch();
+  var location = useLocation();
   var initialValues = useSelector(function (state) {
     return state.notification.notificationSettings;
   });
-  var _useState = useState("docFlowSettings"),
+  var getDefaultProjectFromPath = function getDefaultProjectFromPath(path) {
+    if (path.includes("/contract")) return "contractSettings";
+    return "docFlowSettings";
+  };
+  var _useState = useState(function () {
+      return getDefaultProjectFromPath(location.pathname);
+    }),
     _useState2 = _slicedToArray(_useState, 2),
     selectedProject = _useState2[0],
     setSelectedProject = _useState2[1];
@@ -46,6 +54,15 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
     _useState4 = _slicedToArray(_useState3, 2),
     allValues = _useState4[0],
     setAllValues = _useState4[1];
+  useImperativeHandle(ref, function () {
+    return {
+      refresh: function refresh() {
+        var projectFromPath = getDefaultProjectFromPath(location.pathname);
+        setSelectedProject(projectFromPath);
+        dispatch(getNotificationSettings());
+      }
+    };
+  });
   useEffect(function () {
     dispatch(getNotificationSettings());
   }, [dispatch]);
@@ -56,16 +73,64 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
     }
   }, [initialValues, form]);
   var handleSwitchChange = function handleSwitchChange(namePath, checked) {
-    var updated = _objectSpread({}, allValues);
+    var updated = structuredClone(allValues);
     var target = updated;
     namePath.forEach(function (key, i) {
       if (i === namePath.length - 1) {
         target[key] = checked;
       } else {
-        target[key] = _objectSpread({}, target[key]);
         target = target[key];
       }
     });
+
+    // Toggle all child switches if general toggle is used
+    if (namePath[0] === "generalSettings" && (namePath[1] === "internalIsActive" || namePath[1] === "emailIsActive")) {
+      var typeToChange = namePath[1] === "internalIsActive" ? "internalSettings" : "emailSettings";
+      Object.keys(projectOptions).forEach(function (projectKey) {
+        if (!updated[projectKey]) updated[projectKey] = {};
+        if (!updated[projectKey][typeToChange]) updated[projectKey][typeToChange] = {};
+        projectOptions[projectKey].keys.forEach(function (key) {
+          updated[projectKey][typeToChange][key] = checked;
+        });
+      });
+    }
+
+    // If any child switch is turned ON → set general ON
+    if (namePath.length === 3 && (namePath[1] === "internalSettings" || namePath[1] === "emailSettings") && checked === true) {
+      var generalKey = namePath[1] === "internalSettings" ? "internalIsActive" : "emailIsActive";
+      if (!updated.generalSettings) updated.generalSettings = {};
+      updated.generalSettings[generalKey] = true;
+    }
+
+    // If child turned OFF → check if all children are OFF → turn OFF general
+    if (namePath.length === 3 && (namePath[1] === "internalSettings" || namePath[1] === "emailSettings")) {
+      var type = namePath[1];
+      var _generalKey = type === "internalSettings" ? "internalIsActive" : "emailIsActive";
+      var anyOn = false;
+      Object.keys(projectOptions).forEach(function (projectKey) {
+        var _updated$projectKey;
+        var settings = ((_updated$projectKey = updated[projectKey]) === null || _updated$projectKey === void 0 ? void 0 : _updated$projectKey[type]) || {};
+        var _iterator = _createForOfIteratorHelper(projectOptions[projectKey].keys),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
+            if (settings[key]) {
+              anyOn = true;
+              break;
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      });
+      if (!anyOn) {
+        if (!updated.generalSettings) updated.generalSettings = {};
+        updated.generalSettings[_generalKey] = false;
+      }
+    }
     setAllValues(updated);
     form.setFieldsValue(updated);
   };
@@ -73,7 +138,7 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
     return projectOptions[selectedProject].keys.map(function (key) {
       var _allValues$selectedPr, _allValues$selectedPr2;
       return /*#__PURE__*/React.createElement(Col, {
-        span: 12,
+        span: 6,
         key: "".concat(selectedProject, "-").concat(type, "-").concat(key)
       }, /*#__PURE__*/React.createElement(Form.Item, {
         className: style.inlineSwitch,
@@ -89,8 +154,9 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
     });
   };
   var onSubmit = useCallback(function (data) {
-    console.log(data, "ew");
+    var _props$onClose;
     dispatch(editNotificationSettings(data));
+    props === null || props === void 0 || (_props$onClose = props.onClose) === null || _props$onClose === void 0 || _props$onClose.call(props);
   }, [dispatch]);
   return /*#__PURE__*/React.createElement("div", {
     className: style.settingsWrapper
@@ -142,17 +208,17 @@ var NotificationSettingsContent = /*#__PURE__*/React.forwardRef(function (props,
   }))), /*#__PURE__*/React.createElement(Text, {
     className: style.settingGroupTitle
   }, "Daxili"), /*#__PURE__*/React.createElement(Row, {
-    gutter: [40, 0]
+    gutter: [24, 24]
   }, renderSwitches("internalSettings")), /*#__PURE__*/React.createElement(Text, {
     className: style.settingGroupTitle
   }, "Email"), /*#__PURE__*/React.createElement(Row, {
-    gutter: [40, 0]
+    gutter: [24, 24]
   }, renderSwitches("emailSettings")), /*#__PURE__*/React.createElement("div", {
     className: style.next_buttons_
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick(e) {
-      var _ref$current, _ref$current$close;
-      ref === null || ref === void 0 || (_ref$current = ref.current) === null || _ref$current === void 0 || (_ref$current$close = _ref$current.close) === null || _ref$current$close === void 0 || _ref$current$close.call(_ref$current);
+      var _props$onClose2;
+      props === null || props === void 0 || (_props$onClose2 = props.onClose) === null || _props$onClose2 === void 0 || _props$onClose2.call(props);
       e.preventDefault();
     },
     color: "white"

package/dist/components/ProfileOptions/index.js

@@ -35,7 +35,7 @@ var ProfileOptions = function ProfileOptions() {
   var notifications = useSelector(function (state) {
     return state.notification.notifications;
   });
-  console.log(notifications);
+  console.log(notificationsRender);
   var _useState5 = useState(localStorage.getItem("theme") || "light"),
     _useState6 = _slicedToArray(_useState5, 2),
     theme = _useState6[0],
@@ -73,6 +73,9 @@ var ProfileOptions = function ProfileOptions() {
       page: page
     }));
   }, [dispatch, size, page, notificationsRender]);
+  useEffect(function () {
+    console.log("notificationsRender:", notificationsRender);
+  }, [notificationsRender]);
   var rootUrl = window.location.origin;
   var menu1 = /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement("div", {
     className: style.links

package/dist/hooks/useNotification.js

@@ -1,17 +1,10 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-// hooks/useNotification.js
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import * as signalR from "@microsoft/signalr";
 import { infoMessageBottomRight } from "../utils/message";
+import { setNotificationsRender } from "../store/slices/global";
+import store from "../store/store"; // ⬅️ Import your Redux store explicitly
+
 var useNotification = function useNotification() {
-  var _useState = useState(function () {
-      // localStorage'dan bildirimi başlat
-      var savedNotifications = localStorage.getItem("notifications");
-      return savedNotifications ? JSON.parse(savedNotifications) : [];
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    notifications = _useState2[0],
-    setNotifications = _useState2[1];
   useEffect(function () {
     var token = localStorage.getItem("token");
     var baseUrl;
@@ -33,6 +26,7 @@ var useNotification = function useNotification() {
       console.log("SignalR bağlantısı quruldu.");
       connection.on("receive", function (message) {
         console.log("Yeni bildiriş:", message);
+        store.dispatch(setNotificationsRender());
         infoMessageBottomRight(message);
       });
     })["catch"](function (err) {
@@ -43,6 +37,5 @@ var useNotification = function useNotification() {
       console.log("SignalR bağlantısı bağlandı.");
     };
   }, []);
-  return notifications;
 };
 export default useNotification;

package/dist/store/slices/global/index.js

@@ -11,9 +11,8 @@ export var global = createSlice({
       var payload = _ref.payload;
       state.loading = payload;
     },
-    setNotificationsRender: function setNotificationsRender(state, _ref2) {
-      var payload = _ref2.payload;
-      state.notificationsRender = payload;
+    setNotificationsRender: function setNotificationsRender(state) {
+      state.notificationsRender = !state.notificationsRender;
     }
   }
 });

package/dist/store/slices/notification/service.js

@@ -35,7 +35,7 @@ _defineProperty(Services, "readNotification", /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return api.post("/NotificationDetails", data);
+          return api.put("/NotificationDetails", data);
         case 2:
           response = _context2.sent;
           return _context2.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
@@ -55,7 +55,9 @@ _defineProperty(Services, "readNotificationAll", /*#__PURE__*/_asyncToGenerator(
     while (1) switch (_context3.prev = _context3.next) {
       case 0:
         _context3.next = 2;
-        return api.post("/NotificationDetails/ReadAll");
+        return api.put("/NotificationDetails/ReadAll", {
+          id: ""
+        });
       case 2:
         response = _context3.sent;
         return _context3.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
@@ -104,7 +106,7 @@ _defineProperty(Services, "editNotificationSettings", /*#__PURE__*/function () {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           _context6.next = 2;
-          return api.post("/notificationusersettings", data);
+          return api.put("/notificationusersettings", data);
         case 2:
           response = _context6.sent;
           return _context6.abrupt("return", response === null || response === void 0 ? void 0 : response.data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banch0u/core-project-test-repository",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Shared core features for all projects",
   "main": "dist/index.js",
   "files": [