diff --git a/application/src/main/data/json/system/widget_bundles/buttons.json b/application/src/main/data/json/system/widget_bundles/buttons.json index a48fba892b..effff6a27a 100644 --- a/application/src/main/data/json/system/widget_bundles/buttons.json +++ b/application/src/main/data/json/system/widget_bundles/buttons.json @@ -3,12 +3,13 @@ "alias": "buttons", "title": "Buttons", "image": "tb-image:YnV0dG9ucy5zdmc=:IkJ1dHRvbnMiIHN5c3RlbSBidW5kbGUgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.75" y="12.75" width="198.5" height="58.5" rx="3.25" fill="white"/>
<rect x="0.75" y="12.75" width="198.5" height="58.5" rx="3.25" stroke="#3F52DD" stroke-width="1.5"/>
<path d="M62.1663 51.3333V44.3333H66.833V51.3333H72.6663V42H76.1663L64.4997 31.5L52.833 42H56.333V51.3333H62.1663Z" fill="#3F52DD"/>
<path d="M90.1953 42.9316H86.21L86.1885 40.9658H89.6689C90.2562 40.9658 90.7539 40.8799 91.1621 40.708C91.5775 40.529 91.8926 40.2747 92.1074 39.9453C92.3223 39.6087 92.4297 39.2041 92.4297 38.7314C92.4297 38.2087 92.3294 37.7826 92.1289 37.4531C91.9284 37.1237 91.6204 36.8838 91.2051 36.7334C90.7969 36.583 90.2741 36.5078 89.6367 36.5078H87.0264V50H84.3301V34.3594H89.6367C90.4961 34.3594 91.2624 34.4417 91.9355 34.6064C92.6159 34.7712 93.1924 35.029 93.665 35.3799C94.1449 35.7236 94.5065 36.1605 94.75 36.6904C95.0007 37.2204 95.126 37.8506 95.126 38.5811C95.126 39.2256 94.972 39.8164 94.6641 40.3535C94.3561 40.8835 93.9014 41.3167 93.2998 41.6533C92.6982 41.9899 91.9499 42.1904 91.0547 42.2549L90.1953 42.9316ZM90.0771 50H85.3613L86.5752 47.8623H90.0771C90.6859 47.8623 91.1943 47.762 91.6025 47.5615C92.0107 47.3538 92.3151 47.071 92.5156 46.7129C92.7233 46.3477 92.8271 45.9215 92.8271 45.4346C92.8271 44.9261 92.7376 44.4857 92.5586 44.1133C92.3796 43.7337 92.0967 43.4437 91.71 43.2432C91.3232 43.0355 90.8184 42.9316 90.1953 42.9316H87.166L87.1875 40.9658H91.1299L91.7422 41.707C92.6016 41.7357 93.307 41.9255 93.8584 42.2764C94.417 42.6273 94.8324 43.082 95.1045 43.6406C95.3766 44.1992 95.5127 44.8008 95.5127 45.4453C95.5127 46.4408 95.2943 47.2751 94.8574 47.9482C94.4277 48.6214 93.8083 49.1335 92.999 49.4844C92.1898 49.8281 91.2158 50 90.0771 50ZM105.216 47.2607V38.377H107.815V50H105.366L105.216 47.2607ZM105.581 44.8438L106.451 44.8223C106.451 45.6029 106.365 46.3226 106.193 46.9814C106.021 47.6331 105.757 48.2025 105.398 48.6895C105.04 49.1693 104.582 49.5452 104.023 49.8174C103.465 50.0824 102.795 50.2148 102.015 50.2148C101.449 50.2148 100.93 50.1325 100.457 49.9678C99.9844 49.8031 99.5762 49.5488 99.2324 49.2051C98.8958 48.8613 98.6344 48.4137 98.4482 47.8623C98.262 47.3109 98.1689 46.652 98.1689 45.8857V38.377H100.758V45.9072C100.758 46.3298 100.808 46.6842 100.908 46.9707C101.008 47.25 101.145 47.4756 101.316 47.6475C101.488 47.8193 101.689 47.9411 101.918 48.0127C102.147 48.0843 102.391 48.1201 102.648 48.1201C103.386 48.1201 103.966 47.9769 104.389 47.6904C104.818 47.3968 105.123 47.0029 105.302 46.5088C105.488 46.0146 105.581 45.4596 105.581 44.8438ZM116.047 38.377V40.2676H109.494V38.377H116.047ZM111.385 35.5303H113.974V46.7881C113.974 47.1462 114.024 47.4219 114.124 47.6152C114.231 47.8014 114.378 47.9268 114.564 47.9912C114.751 48.0557 114.969 48.0879 115.22 48.0879C115.399 48.0879 115.571 48.0771 115.735 48.0557C115.9 48.0342 116.033 48.0127 116.133 47.9912L116.144 49.9678C115.929 50.0322 115.678 50.0895 115.392 50.1396C115.112 50.1898 114.79 50.2148 114.425 50.2148C113.83 50.2148 113.304 50.111 112.846 49.9033C112.387 49.6885 112.029 49.3411 111.771 48.8613C111.514 48.3815 111.385 47.7441 111.385 46.9492V35.5303ZM123.623 38.377V40.2676H117.07V38.377H123.623ZM118.961 35.5303H121.55V46.7881C121.55 47.1462 121.6 47.4219 121.7 47.6152C121.808 47.8014 121.954 47.9268 122.141 47.9912C122.327 48.0557 122.545 48.0879 122.796 48.0879C122.975 48.0879 123.147 48.0771 123.312 48.0557C123.476 48.0342 123.609 48.0127 123.709 47.9912L123.72 49.9678C123.505 50.0322 123.254 50.0895 122.968 50.1396C122.688 50.1898 122.366 50.2148 122.001 50.2148C121.407 50.2148 120.88 50.111 120.422 49.9033C119.964 49.6885 119.605 49.3411 119.348 48.8613C119.09 48.3815 118.961 47.7441 118.961 46.9492V35.5303ZM125.119 44.3174V44.0703C125.119 43.2324 125.241 42.4554 125.484 41.7393C125.728 41.016 126.079 40.3893 126.537 39.8594C127.003 39.3223 127.568 38.9069 128.234 38.6133C128.908 38.3125 129.667 38.1621 130.512 38.1621C131.364 38.1621 132.123 38.3125 132.789 38.6133C133.462 38.9069 134.032 39.3223 134.497 39.8594C134.963 40.3893 135.317 41.016 135.561 41.7393C135.804 42.4554 135.926 43.2324 135.926 44.0703V44.3174C135.926 45.1553 135.804 45.9323 135.561 46.6484C135.317 47.3646 134.963 47.9912 134.497 48.5283C134.032 49.0583 133.466 49.4736 132.8 49.7744C132.134 50.068 131.378 50.2148 130.533 50.2148C129.681 50.2148 128.918 50.068 128.245 49.7744C127.579 49.4736 127.013 49.0583 126.548 48.5283C126.082 47.9912 125.728 47.3646 125.484 46.6484C125.241 45.9323 125.119 45.1553 125.119 44.3174ZM127.708 44.0703V44.3174C127.708 44.8402 127.762 45.3343 127.869 45.7998C127.977 46.2653 128.145 46.6735 128.374 47.0244C128.603 47.3753 128.897 47.651 129.255 47.8516C129.613 48.0521 130.039 48.1523 130.533 48.1523C131.013 48.1523 131.428 48.0521 131.779 47.8516C132.137 47.651 132.431 47.3753 132.66 47.0244C132.889 46.6735 133.058 46.2653 133.165 45.7998C133.28 45.3343 133.337 44.8402 133.337 44.3174V44.0703C133.337 43.5547 133.28 43.0677 133.165 42.6094C133.058 42.1439 132.886 41.7321 132.649 41.374C132.42 41.016 132.127 40.7367 131.769 40.5361C131.418 40.3285 130.999 40.2246 130.512 40.2246C130.025 40.2246 129.602 40.3285 129.244 40.5361C128.893 40.7367 128.603 41.016 128.374 41.374C128.145 41.7321 127.977 42.1439 127.869 42.6094C127.762 43.0677 127.708 43.5547 127.708 44.0703ZM140.913 40.8584V50H138.324V38.377H140.763L140.913 40.8584ZM140.451 43.7588L139.613 43.748C139.62 42.9245 139.735 42.1689 139.957 41.4814C140.186 40.7939 140.501 40.2031 140.902 39.709C141.311 39.2148 141.798 38.8353 142.363 38.5703C142.929 38.2982 143.559 38.1621 144.254 38.1621C144.812 38.1621 145.317 38.2409 145.769 38.3984C146.227 38.5488 146.617 38.7959 146.939 39.1396C147.269 39.4834 147.52 39.931 147.691 40.4824C147.863 41.0267 147.949 41.6963 147.949 42.4912V50H145.35V42.4805C145.35 41.9219 145.267 41.4814 145.103 41.1592C144.945 40.8298 144.712 40.597 144.404 40.4609C144.104 40.3177 143.728 40.2461 143.276 40.2461C142.832 40.2461 142.435 40.3392 142.084 40.5254C141.733 40.7116 141.436 40.9658 141.192 41.2881C140.956 41.6104 140.773 41.9827 140.645 42.4053C140.516 42.8278 140.451 43.279 140.451 43.7588Z" fill="#3F52DD"/>
<rect x="0.75" y="88.75" width="198.5" height="58.5" rx="3.25" fill="white"/>
<rect x="0.75" y="88.75" width="198.5" height="58.5" rx="3.25" stroke="#3F52DD" stroke-width="1.5"/>
<path d="M65.4997 111V113.333H75.5213L64.333 124.522L65.978 126.167L77.1663 114.978V125H79.4997V111H65.4997Z" fill="#3F52DD"/>
<path d="M100.564 121.972C100.564 121.649 100.514 121.363 100.414 121.112C100.321 120.862 100.153 120.632 99.9092 120.425C99.6657 120.217 99.3219 120.017 98.8779 119.823C98.4411 119.623 97.8825 119.419 97.2021 119.211C96.4574 118.982 95.7699 118.728 95.1396 118.448C94.5166 118.162 93.9723 117.832 93.5068 117.46C93.0413 117.08 92.6797 116.647 92.4219 116.16C92.1641 115.666 92.0352 115.097 92.0352 114.452C92.0352 113.815 92.1676 113.235 92.4326 112.712C92.7048 112.189 93.0879 111.738 93.582 111.358C94.0833 110.972 94.6742 110.674 95.3545 110.467C96.0348 110.252 96.7868 110.145 97.6104 110.145C98.7705 110.145 99.7695 110.359 100.607 110.789C101.452 111.219 102.101 111.795 102.552 112.519C103.01 113.242 103.239 114.04 103.239 114.914H100.564C100.564 114.398 100.453 113.944 100.231 113.55C100.017 113.149 99.6872 112.834 99.2432 112.604C98.8063 112.375 98.2513 112.261 97.5781 112.261C96.9408 112.261 96.4108 112.357 95.9883 112.551C95.5658 112.744 95.2507 113.006 95.043 113.335C94.8353 113.664 94.7314 114.037 94.7314 114.452C94.7314 114.746 94.7995 115.014 94.9355 115.258C95.0716 115.494 95.2793 115.716 95.5586 115.924C95.8379 116.124 96.1888 116.314 96.6113 116.493C97.0339 116.672 97.5316 116.844 98.1045 117.009C98.971 117.267 99.7266 117.553 100.371 117.868C101.016 118.176 101.553 118.527 101.982 118.921C102.412 119.315 102.734 119.762 102.949 120.264C103.164 120.758 103.271 121.32 103.271 121.95C103.271 122.609 103.139 123.203 102.874 123.733C102.609 124.256 102.229 124.704 101.735 125.076C101.248 125.441 100.661 125.724 99.9736 125.925C99.2933 126.118 98.5342 126.215 97.6963 126.215C96.9443 126.215 96.2031 126.115 95.4727 125.914C94.7493 125.714 94.0905 125.409 93.4961 125.001C92.9017 124.586 92.429 124.07 92.0781 123.454C91.7272 122.831 91.5518 122.104 91.5518 121.273H94.248C94.248 121.782 94.334 122.215 94.5059 122.573C94.6849 122.931 94.932 123.225 95.2471 123.454C95.5622 123.676 95.9274 123.841 96.3428 123.948C96.7653 124.056 97.2165 124.109 97.6963 124.109C98.3265 124.109 98.8529 124.02 99.2754 123.841C99.7051 123.662 100.027 123.411 100.242 123.089C100.457 122.767 100.564 122.394 100.564 121.972ZM110.772 126.215C109.913 126.215 109.136 126.075 108.441 125.796C107.754 125.509 107.167 125.112 106.68 124.604C106.2 124.095 105.831 123.497 105.573 122.81C105.315 122.122 105.187 121.381 105.187 120.586V120.156C105.187 119.247 105.319 118.423 105.584 117.686C105.849 116.948 106.218 116.318 106.69 115.795C107.163 115.265 107.722 114.86 108.366 114.581C109.011 114.302 109.709 114.162 110.461 114.162C111.292 114.162 112.019 114.302 112.642 114.581C113.265 114.86 113.78 115.254 114.188 115.763C114.604 116.264 114.912 116.862 115.112 117.557C115.32 118.251 115.424 119.018 115.424 119.855V120.962H106.443V119.104H112.867V118.899C112.853 118.434 112.76 117.997 112.588 117.589C112.423 117.181 112.169 116.851 111.825 116.601C111.481 116.35 111.023 116.225 110.45 116.225C110.021 116.225 109.637 116.318 109.301 116.504C108.971 116.683 108.696 116.944 108.474 117.288C108.252 117.632 108.08 118.047 107.958 118.534C107.843 119.014 107.786 119.555 107.786 120.156V120.586C107.786 121.094 107.854 121.567 107.99 122.004C108.133 122.434 108.341 122.81 108.613 123.132C108.885 123.454 109.215 123.708 109.602 123.895C109.988 124.074 110.429 124.163 110.923 124.163C111.546 124.163 112.101 124.038 112.588 123.787C113.075 123.536 113.497 123.182 113.855 122.724L115.22 124.045C114.969 124.41 114.643 124.761 114.242 125.098C113.841 125.427 113.351 125.696 112.771 125.903C112.198 126.111 111.532 126.215 110.772 126.215ZM120.261 116.858V126H117.672V114.377H120.11L120.261 116.858ZM119.799 119.759L118.961 119.748C118.968 118.924 119.083 118.169 119.305 117.481C119.534 116.794 119.849 116.203 120.25 115.709C120.658 115.215 121.145 114.835 121.711 114.57C122.277 114.298 122.907 114.162 123.602 114.162C124.16 114.162 124.665 114.241 125.116 114.398C125.575 114.549 125.965 114.796 126.287 115.14C126.617 115.483 126.867 115.931 127.039 116.482C127.211 117.027 127.297 117.696 127.297 118.491V126H124.697V118.48C124.697 117.922 124.615 117.481 124.45 117.159C124.293 116.83 124.06 116.597 123.752 116.461C123.451 116.318 123.075 116.246 122.624 116.246C122.18 116.246 121.783 116.339 121.432 116.525C121.081 116.712 120.784 116.966 120.54 117.288C120.304 117.61 120.121 117.983 119.992 118.405C119.863 118.828 119.799 119.279 119.799 119.759ZM137.279 123.594V109.5H139.879V126H137.526L137.279 123.594ZM129.717 120.317V120.092C129.717 119.211 129.821 118.409 130.028 117.686C130.236 116.955 130.537 116.328 130.931 115.806C131.325 115.276 131.804 114.871 132.37 114.592C132.936 114.305 133.573 114.162 134.282 114.162C134.984 114.162 135.6 114.298 136.13 114.57C136.66 114.842 137.111 115.233 137.483 115.741C137.856 116.243 138.153 116.844 138.375 117.546C138.597 118.241 138.755 119.014 138.848 119.866V120.586C138.755 121.417 138.597 122.176 138.375 122.863C138.153 123.551 137.856 124.145 137.483 124.646C137.111 125.148 136.656 125.535 136.119 125.807C135.589 126.079 134.97 126.215 134.261 126.215C133.559 126.215 132.925 126.068 132.359 125.774C131.801 125.481 131.325 125.069 130.931 124.539C130.537 124.009 130.236 123.386 130.028 122.67C129.821 121.947 129.717 121.162 129.717 120.317ZM132.306 120.092V120.317C132.306 120.847 132.352 121.341 132.445 121.8C132.546 122.258 132.7 122.663 132.907 123.014C133.115 123.357 133.383 123.63 133.713 123.83C134.049 124.023 134.451 124.12 134.916 124.12C135.503 124.12 135.987 123.991 136.366 123.733C136.746 123.476 137.043 123.128 137.258 122.691C137.48 122.247 137.63 121.753 137.709 121.209V119.265C137.666 118.842 137.576 118.448 137.44 118.083C137.312 117.718 137.136 117.399 136.914 117.127C136.692 116.848 136.416 116.633 136.087 116.482C135.765 116.325 135.382 116.246 134.938 116.246C134.465 116.246 134.064 116.346 133.734 116.547C133.405 116.747 133.133 117.023 132.918 117.374C132.71 117.725 132.556 118.133 132.456 118.599C132.356 119.064 132.306 119.562 132.306 120.092Z" fill="#3F52DD"/>
</svg>
", - "description": null, + "description": "Facilitates user interaction by enabling navigation between dashboard states, sending RPC commands to devices, and updating device attributes or time-series data.", "order": 7500, "name": "Buttons" }, "widgetTypeFqns": [ "action_button", - "command_button" + "command_button", + "power_button" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_bundles/control_widgets.json b/application/src/main/data/json/system/widget_bundles/control_widgets.json index 5dce630e64..560063a2c4 100644 --- a/application/src/main/data/json/system/widget_bundles/control_widgets.json +++ b/application/src/main/data/json/system/widget_bundles/control_widgets.json @@ -9,6 +9,9 @@ }, "widgetTypeFqns": [ "single_switch", + "command_button", + "power_button", + "slider", "control_widgets.switch_control", "control_widgets.slide_toggle_control", "control_widgets.round_switch", diff --git a/application/src/main/data/json/system/widget_types/action_button.json b/application/src/main/data/json/system/widget_types/action_button.json index e6ffa8084e..a73aa198e7 100644 --- a/application/src/main/data/json/system/widget_types/action_button.json +++ b/application/src/main/data/json/system/widget_types/action_button.json @@ -3,7 +3,7 @@ "name": "Action button", "deprecated": false, "image": "tb-image:YWN0aW9uLWJ1dHRvbi5zdmc=:IkFjdGlvbiBidXR0b24iIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.75" y="50.75" width="198.5" height="58.5" rx="3.25" fill="white"/>
<rect x="0.75" y="50.75" width="198.5" height="58.5" rx="3.25" stroke="#3F52DD" stroke-width="1.5"/>
<path d="M62.1673 89.3333V82.3333H66.834V89.3333H72.6673V80H76.1673L64.5007 69.5L52.834 80H56.334V89.3333H62.1673Z" fill="#3F52DD"/>
<path d="M90.1953 80.9316H86.21L86.1885 78.9658H89.6689C90.2562 78.9658 90.7539 78.8799 91.1621 78.708C91.5775 78.529 91.8926 78.2747 92.1074 77.9453C92.3223 77.6087 92.4297 77.2041 92.4297 76.7314C92.4297 76.2087 92.3294 75.7826 92.1289 75.4531C91.9284 75.1237 91.6204 74.8838 91.2051 74.7334C90.7969 74.583 90.2741 74.5078 89.6367 74.5078H87.0264V88H84.3301V72.3594H89.6367C90.4961 72.3594 91.2624 72.4417 91.9355 72.6064C92.6159 72.7712 93.1924 73.029 93.665 73.3799C94.1449 73.7236 94.5065 74.1605 94.75 74.6904C95.0007 75.2204 95.126 75.8506 95.126 76.5811C95.126 77.2256 94.972 77.8164 94.6641 78.3535C94.3561 78.8835 93.9014 79.3167 93.2998 79.6533C92.6982 79.9899 91.9499 80.1904 91.0547 80.2549L90.1953 80.9316ZM90.0771 88H85.3613L86.5752 85.8623H90.0771C90.6859 85.8623 91.1943 85.762 91.6025 85.5615C92.0107 85.3538 92.3151 85.071 92.5156 84.7129C92.7233 84.3477 92.8271 83.9215 92.8271 83.4346C92.8271 82.9261 92.7376 82.4857 92.5586 82.1133C92.3796 81.7337 92.0967 81.4437 91.71 81.2432C91.3232 81.0355 90.8184 80.9316 90.1953 80.9316H87.166L87.1875 78.9658H91.1299L91.7422 79.707C92.6016 79.7357 93.307 79.9255 93.8584 80.2764C94.417 80.6273 94.8324 81.082 95.1045 81.6406C95.3766 82.1992 95.5127 82.8008 95.5127 83.4453C95.5127 84.4408 95.2943 85.2751 94.8574 85.9482C94.4277 86.6214 93.8083 87.1335 92.999 87.4844C92.1898 87.8281 91.2158 88 90.0771 88ZM105.216 85.2607V76.377H107.815V88H105.366L105.216 85.2607ZM105.581 82.8438L106.451 82.8223C106.451 83.6029 106.365 84.3226 106.193 84.9814C106.021 85.6331 105.757 86.2025 105.398 86.6895C105.04 87.1693 104.582 87.5452 104.023 87.8174C103.465 88.0824 102.795 88.2148 102.015 88.2148C101.449 88.2148 100.93 88.1325 100.457 87.9678C99.9844 87.8031 99.5762 87.5488 99.2324 87.2051C98.8958 86.8613 98.6344 86.4137 98.4482 85.8623C98.262 85.3109 98.1689 84.652 98.1689 83.8857V76.377H100.758V83.9072C100.758 84.3298 100.808 84.6842 100.908 84.9707C101.008 85.25 101.145 85.4756 101.316 85.6475C101.488 85.8193 101.689 85.9411 101.918 86.0127C102.147 86.0843 102.391 86.1201 102.648 86.1201C103.386 86.1201 103.966 85.9769 104.389 85.6904C104.818 85.3968 105.123 85.0029 105.302 84.5088C105.488 84.0146 105.581 83.4596 105.581 82.8438ZM116.047 76.377V78.2676H109.494V76.377H116.047ZM111.385 73.5303H113.974V84.7881C113.974 85.1462 114.024 85.4219 114.124 85.6152C114.231 85.8014 114.378 85.9268 114.564 85.9912C114.751 86.0557 114.969 86.0879 115.22 86.0879C115.399 86.0879 115.571 86.0771 115.735 86.0557C115.9 86.0342 116.033 86.0127 116.133 85.9912L116.144 87.9678C115.929 88.0322 115.678 88.0895 115.392 88.1396C115.112 88.1898 114.79 88.2148 114.425 88.2148C113.83 88.2148 113.304 88.111 112.846 87.9033C112.387 87.6885 112.029 87.3411 111.771 86.8613C111.514 86.3815 111.385 85.7441 111.385 84.9492V73.5303ZM123.623 76.377V78.2676H117.07V76.377H123.623ZM118.961 73.5303H121.55V84.7881C121.55 85.1462 121.6 85.4219 121.7 85.6152C121.808 85.8014 121.954 85.9268 122.141 85.9912C122.327 86.0557 122.545 86.0879 122.796 86.0879C122.975 86.0879 123.147 86.0771 123.312 86.0557C123.476 86.0342 123.609 86.0127 123.709 85.9912L123.72 87.9678C123.505 88.0322 123.254 88.0895 122.968 88.1396C122.688 88.1898 122.366 88.2148 122.001 88.2148C121.407 88.2148 120.88 88.111 120.422 87.9033C119.964 87.6885 119.605 87.3411 119.348 86.8613C119.09 86.3815 118.961 85.7441 118.961 84.9492V73.5303ZM125.119 82.3174V82.0703C125.119 81.2324 125.241 80.4554 125.484 79.7393C125.728 79.016 126.079 78.3893 126.537 77.8594C127.003 77.3223 127.568 76.9069 128.234 76.6133C128.908 76.3125 129.667 76.1621 130.512 76.1621C131.364 76.1621 132.123 76.3125 132.789 76.6133C133.462 76.9069 134.032 77.3223 134.497 77.8594C134.963 78.3893 135.317 79.016 135.561 79.7393C135.804 80.4554 135.926 81.2324 135.926 82.0703V82.3174C135.926 83.1553 135.804 83.9323 135.561 84.6484C135.317 85.3646 134.963 85.9912 134.497 86.5283C134.032 87.0583 133.466 87.4736 132.8 87.7744C132.134 88.068 131.378 88.2148 130.533 88.2148C129.681 88.2148 128.918 88.068 128.245 87.7744C127.579 87.4736 127.013 87.0583 126.548 86.5283C126.082 85.9912 125.728 85.3646 125.484 84.6484C125.241 83.9323 125.119 83.1553 125.119 82.3174ZM127.708 82.0703V82.3174C127.708 82.8402 127.762 83.3343 127.869 83.7998C127.977 84.2653 128.145 84.6735 128.374 85.0244C128.603 85.3753 128.897 85.651 129.255 85.8516C129.613 86.0521 130.039 86.1523 130.533 86.1523C131.013 86.1523 131.428 86.0521 131.779 85.8516C132.137 85.651 132.431 85.3753 132.66 85.0244C132.889 84.6735 133.058 84.2653 133.165 83.7998C133.28 83.3343 133.337 82.8402 133.337 82.3174V82.0703C133.337 81.5547 133.28 81.0677 133.165 80.6094C133.058 80.1439 132.886 79.7321 132.649 79.374C132.42 79.016 132.127 78.7367 131.769 78.5361C131.418 78.3285 130.999 78.2246 130.512 78.2246C130.025 78.2246 129.602 78.3285 129.244 78.5361C128.893 78.7367 128.603 79.016 128.374 79.374C128.145 79.7321 127.977 80.1439 127.869 80.6094C127.762 81.0677 127.708 81.5547 127.708 82.0703ZM140.913 78.8584V88H138.324V76.377H140.763L140.913 78.8584ZM140.451 81.7588L139.613 81.748C139.62 80.9245 139.735 80.1689 139.957 79.4814C140.186 78.7939 140.501 78.2031 140.902 77.709C141.311 77.2148 141.798 76.8353 142.363 76.5703C142.929 76.2982 143.559 76.1621 144.254 76.1621C144.812 76.1621 145.317 76.2409 145.769 76.3984C146.227 76.5488 146.617 76.7959 146.939 77.1396C147.269 77.4834 147.52 77.931 147.691 78.4824C147.863 79.0267 147.949 79.6963 147.949 80.4912V88H145.35V80.4805C145.35 79.9219 145.267 79.4814 145.103 79.1592C144.945 78.8298 144.712 78.597 144.404 78.4609C144.104 78.3177 143.728 78.2461 143.276 78.2461C142.832 78.2461 142.435 78.3392 142.084 78.5254C141.733 78.7116 141.436 78.9658 141.192 79.2881C140.956 79.6104 140.773 79.9827 140.645 80.4053C140.516 80.8278 140.451 81.279 140.451 81.7588Z" fill="#3F52DD"/>
</svg>
", - "description": "Action button.", + "description": "Facilitates single-click navigation to other dashboards, states, or custom actions. Configurable settings allow for on-click action definition and conditions for button activation or deactivation. It offers various layouts and custom styling options for different states.", "descriptor": { "type": "latest", "sizeX": 3, @@ -22,6 +22,8 @@ "tags": [ "button", "action", - "navigation" + "navigation", + "navigate", + "dashboard state" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/command_button.json b/application/src/main/data/json/system/widget_types/command_button.json index 1ffd2326a8..dcfeb108f2 100644 --- a/application/src/main/data/json/system/widget_types/command_button.json +++ b/application/src/main/data/json/system/widget_types/command_button.json @@ -3,7 +3,7 @@ "name": "Command button", "deprecated": false, "image": "tb-image:Y29tbWFuZC1idXR0b24uc3Zn:IkNvbW1hbmQgYnV0dG9uIiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.75" y="50.75" width="198.5" height="58.5" rx="3.25" fill="white"/>
<rect x="0.75" y="50.75" width="198.5" height="58.5" rx="3.25" stroke="#3F52DD" stroke-width="1.5"/>
<path d="M65.4997 73V75.3333H75.5213L64.333 86.5217L65.978 88.1667L77.1663 76.9783V87H79.4997V73H65.4997Z" fill="#3F52DD"/>
<path d="M100.564 83.9717C100.564 83.6494 100.514 83.363 100.414 83.1123C100.321 82.8617 100.153 82.6325 99.9092 82.4248C99.6657 82.2171 99.3219 82.0166 98.8779 81.8232C98.4411 81.6227 97.8825 81.4186 97.2021 81.2109C96.4574 80.9818 95.7699 80.7275 95.1396 80.4482C94.5166 80.1618 93.9723 79.8324 93.5068 79.46C93.0413 79.0804 92.6797 78.6471 92.4219 78.1602C92.1641 77.666 92.0352 77.0967 92.0352 76.4521C92.0352 75.8148 92.1676 75.2347 92.4326 74.7119C92.7048 74.1891 93.0879 73.738 93.582 73.3584C94.0833 72.9717 94.6742 72.6745 95.3545 72.4668C96.0348 72.252 96.7868 72.1445 97.6104 72.1445C98.7705 72.1445 99.7695 72.3594 100.607 72.7891C101.452 73.2188 102.101 73.7952 102.552 74.5186C103.01 75.2419 103.239 76.0404 103.239 76.9141H100.564C100.564 76.3984 100.453 75.9437 100.231 75.5498C100.017 75.1488 99.6872 74.8337 99.2432 74.6045C98.8063 74.3753 98.2513 74.2607 97.5781 74.2607C96.9408 74.2607 96.4108 74.3574 95.9883 74.5508C95.5658 74.7441 95.2507 75.0055 95.043 75.335C94.8353 75.6644 94.7314 76.0368 94.7314 76.4521C94.7314 76.7458 94.7995 77.0143 94.9355 77.2578C95.0716 77.4941 95.2793 77.7161 95.5586 77.9238C95.8379 78.1243 96.1888 78.3141 96.6113 78.4932C97.0339 78.6722 97.5316 78.8441 98.1045 79.0088C98.971 79.2666 99.7266 79.5531 100.371 79.8682C101.016 80.1761 101.553 80.527 101.982 80.9209C102.412 81.3148 102.734 81.7624 102.949 82.2637C103.164 82.7578 103.271 83.32 103.271 83.9502C103.271 84.609 103.139 85.2035 102.874 85.7334C102.609 86.2562 102.229 86.7038 101.735 87.0762C101.248 87.4414 100.661 87.7243 99.9736 87.9248C99.2933 88.1182 98.5342 88.2148 97.6963 88.2148C96.9443 88.2148 96.2031 88.1146 95.4727 87.9141C94.7493 87.7135 94.0905 87.4092 93.4961 87.001C92.9017 86.5856 92.429 86.07 92.0781 85.4541C91.7272 84.8311 91.5518 84.1042 91.5518 83.2734H94.248C94.248 83.7819 94.334 84.2152 94.5059 84.5732C94.6849 84.9313 94.932 85.2249 95.2471 85.4541C95.5622 85.6761 95.9274 85.8408 96.3428 85.9482C96.7653 86.0557 97.2165 86.1094 97.6963 86.1094C98.3265 86.1094 98.8529 86.0199 99.2754 85.8408C99.7051 85.6618 100.027 85.4111 100.242 85.0889C100.457 84.7666 100.564 84.3942 100.564 83.9717ZM110.772 88.2148C109.913 88.2148 109.136 88.0752 108.441 87.7959C107.754 87.5094 107.167 87.112 106.68 86.6035C106.2 86.0951 105.831 85.4971 105.573 84.8096C105.315 84.1221 105.187 83.3809 105.187 82.5859V82.1562C105.187 81.2467 105.319 80.4232 105.584 79.6855C105.849 78.9479 106.218 78.3177 106.69 77.7949C107.163 77.265 107.722 76.8604 108.366 76.5811C109.011 76.3018 109.709 76.1621 110.461 76.1621C111.292 76.1621 112.019 76.3018 112.642 76.5811C113.265 76.8604 113.78 77.2542 114.188 77.7627C114.604 78.264 114.912 78.862 115.112 79.5566C115.32 80.2513 115.424 81.0176 115.424 81.8555V82.9619H106.443V81.1035H112.867V80.8994C112.853 80.4339 112.76 79.9971 112.588 79.5889C112.423 79.1807 112.169 78.8512 111.825 78.6006C111.481 78.3499 111.023 78.2246 110.45 78.2246C110.021 78.2246 109.637 78.3177 109.301 78.5039C108.971 78.6829 108.696 78.9443 108.474 79.2881C108.252 79.6318 108.08 80.0472 107.958 80.5342C107.843 81.014 107.786 81.5547 107.786 82.1562V82.5859C107.786 83.0944 107.854 83.5671 107.99 84.0039C108.133 84.4336 108.341 84.8096 108.613 85.1318C108.885 85.4541 109.215 85.7083 109.602 85.8945C109.988 86.0736 110.429 86.1631 110.923 86.1631C111.546 86.1631 112.101 86.0378 112.588 85.7871C113.075 85.5365 113.497 85.182 113.855 84.7236L115.22 86.0449C114.969 86.4102 114.643 86.7611 114.242 87.0977C113.841 87.4271 113.351 87.6956 112.771 87.9033C112.198 88.111 111.532 88.2148 110.772 88.2148ZM120.261 78.8584V88H117.672V76.377H120.11L120.261 78.8584ZM119.799 81.7588L118.961 81.748C118.968 80.9245 119.083 80.1689 119.305 79.4814C119.534 78.7939 119.849 78.2031 120.25 77.709C120.658 77.2148 121.145 76.8353 121.711 76.5703C122.277 76.2982 122.907 76.1621 123.602 76.1621C124.16 76.1621 124.665 76.2409 125.116 76.3984C125.575 76.5488 125.965 76.7959 126.287 77.1396C126.617 77.4834 126.867 77.931 127.039 78.4824C127.211 79.0267 127.297 79.6963 127.297 80.4912V88H124.697V80.4805C124.697 79.9219 124.615 79.4814 124.45 79.1592C124.293 78.8298 124.06 78.597 123.752 78.4609C123.451 78.3177 123.075 78.2461 122.624 78.2461C122.18 78.2461 121.783 78.3392 121.432 78.5254C121.081 78.7116 120.784 78.9658 120.54 79.2881C120.304 79.6104 120.121 79.9827 119.992 80.4053C119.863 80.8278 119.799 81.279 119.799 81.7588ZM137.279 85.5938V71.5H139.879V88H137.526L137.279 85.5938ZM129.717 82.3174V82.0918C129.717 81.2109 129.821 80.4089 130.028 79.6855C130.236 78.9551 130.537 78.3285 130.931 77.8057C131.325 77.2757 131.804 76.8711 132.37 76.5918C132.936 76.3053 133.573 76.1621 134.282 76.1621C134.984 76.1621 135.6 76.2982 136.13 76.5703C136.66 76.8424 137.111 77.2327 137.483 77.7412C137.856 78.2425 138.153 78.8441 138.375 79.5459C138.597 80.2406 138.755 81.014 138.848 81.8662V82.5859C138.755 83.4167 138.597 84.1758 138.375 84.8633C138.153 85.5508 137.856 86.1452 137.483 86.6465C137.111 87.1478 136.656 87.5345 136.119 87.8066C135.589 88.0788 134.97 88.2148 134.261 88.2148C133.559 88.2148 132.925 88.068 132.359 87.7744C131.801 87.4808 131.325 87.069 130.931 86.5391C130.537 86.0091 130.236 85.3861 130.028 84.6699C129.821 83.9466 129.717 83.1624 129.717 82.3174ZM132.306 82.0918V82.3174C132.306 82.8473 132.352 83.3415 132.445 83.7998C132.546 84.2581 132.7 84.6628 132.907 85.0137C133.115 85.3574 133.383 85.6296 133.713 85.8301C134.049 86.0234 134.451 86.1201 134.916 86.1201C135.503 86.1201 135.987 85.9912 136.366 85.7334C136.746 85.4756 137.043 85.1283 137.258 84.6914C137.48 84.2474 137.63 83.7533 137.709 83.209V81.2646C137.666 80.8421 137.576 80.4482 137.44 80.083C137.312 79.7178 137.136 79.3991 136.914 79.127C136.692 78.8477 136.416 78.6328 136.087 78.4824C135.765 78.3249 135.382 78.2461 134.938 78.2461C134.465 78.2461 134.064 78.3464 133.734 78.5469C133.405 78.7474 133.133 79.0231 132.918 79.374C132.71 79.7249 132.556 80.1331 132.456 80.5986C132.356 81.0641 132.306 81.5618 132.306 82.0918Z" fill="#3F52DD"/>
</svg>
", - "description": "Sends the command to the device or updates attribute/time-series when the user clicks the button. Widget settings will enable you to configure behavior how to fetch the initial state and what to trigger when click.", + "description": "Allows single-click commands to devices or updates to attributes/time-series. Settings enable definition of the on-click action and condition when the button is disabled. Supports multiple layouts and custom styles for different states.", "descriptor": { "type": "rpc", "sizeX": 3, @@ -31,6 +31,9 @@ "subroutine call", "inter-process communication", "server request", - "button" + "button", + "update attribute", + "set attribute", + "add time-series" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/power_button.json b/application/src/main/data/json/system/widget_types/power_button.json new file mode 100644 index 0000000000..d90439d82f --- /dev/null +++ b/application/src/main/data/json/system/widget_types/power_button.json @@ -0,0 +1,36 @@ +{ + "fqn": "power_button", + "name": "Power button", + "deprecated": false, + "image": "tb-image:cG93ZXItYnV0dG9uLnN2Zw==:IlBvd2VyIGJ1dHRvbiIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAwIiBoZWlnaHQ9IjE2MCIgdmlld0JveD0iMCAwIDIwMCAxNjAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2lfNDU4OF84ODQyMCkiPgo8cGF0aCBkPSJNMTQ2LjUgODBDMTQ2LjUgMTA1LjEyOSAxMjUuNjgxIDEyNS41IDEwMCAxMjUuNUM3NC4zMTg4IDEyNS41IDUzLjUgMTA1LjEyOSA1My41IDgwQzUzLjUgNTQuODcxIDc0LjMxODggMzQuNSAxMDAgMzQuNUMxMjUuNjgxIDM0LjUgMTQ2LjUgNTQuODcxIDE0Ni41IDgwWiIgZmlsbD0iIzNGNTJERCIvPgo8L2c+CjxwYXRoIGQ9Ik0xNDUuNSA4MEMxNDUuNSAxMDQuNTU2IDEyNS4xNSAxMjQuNSAxMDAgMTI0LjVDNzQuODUwNCAxMjQuNSA1NC41IDEwNC41NTYgNTQuNSA4MEM1NC41IDU1LjQ0MzcgNzQuODUwNCAzNS41IDEwMCAzNS41QzEyNS4xNSAzNS41IDE0NS41IDU1LjQ0MzcgMTQ1LjUgODBaIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjIiLz4KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjFfZF80NTg4Xzg4NDIwKSI+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTAwIDEzNS41QzEzMS4yMDQgMTM1LjUgMTU2LjUgMTEwLjY1MiAxNTYuNSA4MEMxNTYuNSA0OS4zNDgyIDEzMS4yMDQgMjQuNSAxMDAgMjQuNUM2OC43OTU5IDI0LjUgNDMuNSA0OS4zNDgyIDQzLjUgODBDNDMuNSAxMTAuNjUyIDY4Ljc5NTkgMTM1LjUgMTAwIDEzNS41Wk0xMDAgMTI1LjVDMTI1LjY4MSAxMjUuNSAxNDYuNSAxMDUuMTI5IDE0Ni41IDgwQzE0Ni41IDU0Ljg3MSAxMjUuNjgxIDM0LjUgMTAwIDM0LjVDNzQuMzE4OCAzNC41IDUzLjUgNTQuODcxIDUzLjUgODBDNTMuNSAxMDUuMTI5IDc0LjMxODggMTI1LjUgMTAwIDEyNS41WiIgZmlsbD0idXJsKCNwYWludDBfbGluZWFyXzQ1ODhfODg0MjApIi8+CjwvZz4KPHBhdGggZD0iTTk4LjM1NzQgNzkuMTg1NVY4MC4xNzM4Qzk4LjM1NzQgODEuMzQ4MyA5OC4yMTA2IDgyLjQwMSA5Ny45MTcgODMuMzMyQzk3LjYyMzQgODQuMjYzIDk3LjIwMDggODUuMDU0NCA5Ni42NDk0IDg1LjcwNjFDOTYuMDk4IDg2LjM1NzcgOTUuNDM1NSA4Ni44NTU1IDk0LjY2MjEgODcuMTk5MkM5My44OTU4IDg3LjU0MyA5My4wMzY1IDg3LjcxNDggOTIuMDg0IDg3LjcxNDhDOTEuMTYwMiA4Ny43MTQ4IDkwLjMxMTUgODcuNTQzIDg5LjUzODEgODcuMTk5MkM4OC43NzE4IDg2Ljg1NTUgODguMTA1OCA4Ni4zNTc3IDg3LjU0IDg1LjcwNjFDODYuOTgxNCA4NS4wNTQ0IDg2LjU0ODIgODQuMjYzIDg2LjI0MDIgODMuMzMyQzg1LjkzMjMgODIuNDAxIDg1Ljc3ODMgODEuMzQ4MyA4NS43NzgzIDgwLjE3MzhWNzkuMTg1NUM4NS43NzgzIDc4LjAxMTEgODUuOTI4NyA3Ni45NjE5IDg2LjIyOTUgNzYuMDM4MUM4Ni41Mzc0IDc1LjEwNzEgODYuOTcwNyA3NC4zMTU4IDg3LjUyOTMgNzMuNjY0MUM4OC4wODc5IDczLjAwNTIgODguNzUwMyA3Mi41MDM5IDg5LjUxNjYgNzIuMTYwMkM5MC4yOSA3MS44MTY0IDkxLjEzODcgNzEuNjQ0NSA5Mi4wNjI1IDcxLjY0NDVDOTMuMDE1IDcxLjY0NDUgOTMuODc0MyA3MS44MTY0IDk0LjY0MDYgNzIuMTYwMkM5NS40MTQxIDcyLjUwMzkgOTYuMDc2NSA3My4wMDUyIDk2LjYyNzkgNzMuNjY0MUM5Ny4xODY1IDc0LjMxNTggOTcuNjEyNiA3NS4xMDcxIDk3LjkwNjIgNzYuMDM4MUM5OC4yMDcgNzYuOTYxOSA5OC4zNTc0IDc4LjAxMTEgOTguMzU3NCA3OS4xODU1Wk05Ni4zMDU3IDgwLjE3MzhWNzkuMTY0MUM5Ni4zMDU3IDc4LjIzMzEgOTYuMjA5IDc3LjQwOTUgOTYuMDE1NiA3Ni42OTM0Qzk1LjgyOTQgNzUuOTc3MiA5NS41NTM3IDc1LjM3NTcgOTUuMTg4NSA3NC44ODg3Qzk0LjgyMzIgNzQuNDAxNyA5NC4zNzU3IDc0LjAzMjkgOTMuODQ1NyA3My43ODIyQzkzLjMyMjkgNzMuNTMxNiA5Mi43Mjg1IDczLjQwNjIgOTIuMDYyNSA3My40MDYyQzkxLjQxOCA3My40MDYyIDkwLjgzNDMgNzMuNTMxNiA5MC4zMTE1IDczLjc4MjJDODkuNzk1OSA3NC4wMzI5IDg5LjM1MTkgNzQuNDAxNyA4OC45Nzk1IDc0Ljg4ODdDODguNjE0MyA3NS4zNzU3IDg4LjMzMTQgNzUuOTc3MiA4OC4xMzA5IDc2LjY5MzRDODcuOTMwMyA3Ny40MDk1IDg3LjgzMDEgNzguMjMzMSA4Ny44MzAxIDc5LjE2NDFWODAuMTczOEM4Ny44MzAxIDgxLjExMiA4Ny45MzAzIDgxLjk0MjcgODguMTMwOSA4Mi42NjZDODguMzMxNCA4My4zODIyIDg4LjYxNzggODMuOTg3MyA4OC45OTAyIDg0LjQ4MTRDODkuMzY5OCA4NC45Njg0IDg5LjgxNzQgODUuMzM3MiA5MC4zMzMgODUuNTg3OUM5MC44NTU4IDg1LjgzODUgOTEuNDM5NSA4NS45NjM5IDkyLjA4NCA4NS45NjM5QzkyLjc1NzIgODUuOTYzOSA5My4zNTUxIDg1LjgzODUgOTMuODc3OSA4NS41ODc5Qzk0LjQwMDcgODUuMzM3MiA5NC44NDExIDg0Ljk2ODQgOTUuMTk5MiA4NC40ODE0Qzk1LjU2NDUgODMuOTg3MyA5NS44NDAyIDgzLjM4MjIgOTYuMDI2NCA4Mi42NjZDOTYuMjEyNiA4MS45NDI3IDk2LjMwNTcgODEuMTEyIDk2LjMwNTcgODAuMTczOFpNMTEzLjQ5MyA3MS44NTk0Vjg3LjVIMTExLjQwOUwxMDMuNTM1IDc1LjQzNjVWODcuNUgxMDEuNDYyVjcxLjg1OTRIMTAzLjUzNUwxMTEuNDQxIDgzLjk1NTFWNzEuODU5NEgxMTMuNDkzWiIgZmlsbD0id2hpdGUiLz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfaV80NTg4Xzg4NDIwIiB4PSI0OC41IiB5PSIzNC41IiB3aWR0aD0iOTgiIGhlaWdodD0iOTYiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0ic2hhcGUiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldCBkeD0iLTUiIGR5PSI1Ii8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjQiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0iYXJpdGhtZXRpYyIgazI9Ii0xIiBrMz0iMSIvPgo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4xNSAwIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJzaGFwZSIgcmVzdWx0PSJlZmZlY3QxX2lubmVyU2hhZG93XzQ1ODhfODg0MjAiLz4KPC9maWx0ZXI+CjxmaWx0ZXIgaWQ9ImZpbHRlcjFfZF80NTg4Xzg4NDIwIiB4PSIzNS41IiB5PSIyMC41IiB3aWR0aD0iMTI5IiBoZWlnaHQ9IjEyNyIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVDb2xvck1hdHJpeCBpbj0iU291cmNlQWxwaGEiIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAxMjcgMCIgcmVzdWx0PSJoYXJkQWxwaGEiLz4KPGZlT2Zmc2V0IGR5PSI0Ii8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjQiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0ib3V0Ii8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjA4IDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJlZmZlY3QxX2Ryb3BTaGFkb3dfNDU4OF84ODQyMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd180NTg4Xzg4NDIwIiByZXN1bHQ9InNoYXBlIi8+CjwvZmlsdGVyPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfNDU4OF84ODQyMCIgeDE9IjY1Ljg5NjQiIHkxPSIxMjQuNSIgeDI9IjEyOS41MTkiIHkyPSIzMy45MjQ4IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNDQ0NDQ0MiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSJ3aGl0ZSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=", + "description": "Sends the command to the device or updates attribute/time-series when the user pushes the button. Widget settings will enable you to configure behavior how to fetch the initial state and what to trigger when power on/off states.", + "descriptor": { + "type": "rpc", + "sizeX": 3.5, + "sizeY": 3.5, + "resources": [], + "templateHtml": "\n", + "templateCss": "", + "controllerScript": "self.onInit = function() {\n self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '280px',\n previewHeight: '280px',\n embedTitlePanel: true,\n displayRpcMessageToast: false\n };\n};\n\nself.onDestroy = function() {\n}\n", + "settingsSchema": "", + "dataKeySettingsSchema": "{}\n", + "settingsDirective": "tb-power-button-widget-settings", + "hasBasicMode": true, + "basicModeDirective": "tb-power-button-basic-config", + "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Power\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":null,\"lineHeight\":\"1.6\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"mdi:lightbulb-outline\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"configMode\":\"basic\",\"targetDevice\":null,\"titleColor\":null,\"borderRadius\":null}" + }, + "tags": [ + "command", + "downlink", + "device configuration", + "device control", + "invocation", + "remote method", + "remote function", + "interface", + "subroutine call", + "inter-process communication", + "server request", + "power" + ] +} \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/progress_bar.json b/application/src/main/data/json/system/widget_types/progress_bar.json index 1a92b6d470..6e60c20942 100644 --- a/application/src/main/data/json/system/widget_types/progress_bar.json +++ b/application/src/main/data/json/system/widget_types/progress_bar.json @@ -2,7 +2,7 @@ "fqn": "progress_bar", "name": "Progress bar", "deprecated": false, - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAeFBMVEXg4ODf39/g4ODg4OAAAAD////g4OD19fUhISE/Ut3j4+OsrKzHx8eQkJB0dHQ8PDzx8fEvLy+6urrV1dWCgoJYWFienp5KSkrv7++GhoZmZmaXl5f39/epqanLy8vCwsL29vZtfORiceJ+fn7m5ubU1NTn6fve4fIbcz38AAAABXRSTlPvIL+vAC9A4IoAAASZSURBVHja7d0NT9swEIDhMji4nb/jxEk/NmCM7f//w/niQLtJyxamtdfiF6EmDkh+1Di0IojVzdWH1e25d311s7paDXD2+cy49nABDfm0gotodSmQ2woRVoVIq0KkVSHSqhBpVYi0KkRaFSKtGUijctrDv6XQwEzHgDjkXLoAiKaoAurzhxAAGGxBm2gMgE+25SHeUNE0QKbRNo/otlWQo2QNQa6xrdpD1DSqW6vyBhmtrD86RKHNGIcOyOUHZJDDEEIe1xgQdT487gGF0CNmgUXnsH+BhPzhCKDFfNh50OgQ6dgQv0HFEB2hw8QYDQo3HlqGZFf0066GDiNQFmvcMEZNEMdH2zza8WhivopwVEjX9QF7yBCVSbwFCc04YdBoy4xhkw3QYAsWjQciiNhH8OT3a8RnXo4ooRm/M3dMSN91m+QnCM+6zN9h2ShTyq4xy08X9mpcVxgswR4yfktymDsJhICbIPEA4n+GJJXTfNS48atIWQzxABKQl0YEJQDiQ/Dl1LeoDyHtONWYj41TDtDYvJMwTZA2w7ADwwNJAAQS9sqgY4NLyb1CKGCrGNeh0QY7Pq6bHvUEQaMcKh5VJkiAgAmIHfGGw7B5hQD1iMHkR4vlC5TLA+l1jeS9dlo5LdojQeYj/7rBp8xrnvz+kSOCg349WjolpES9itphBEm9BeI3OJ46omLI8qhppP2e6z28sTqvKkRaFSKtCpFWhUirQqRVIdKqEGlViLQqRFoVIq0KkVaFSKtCpFUh0qoQaVWItCpEWhUirQqR1jzER609HEbSbhT4G4g3AXOWYKrpAnYgszlIjyVXJNTl7XOEJMQ+ArXT5L3LpBQJZDYD6RGJAQED5DKoBbnN3uTfvIAAgBB7EFyBzBbQlXsTNV/EQGh/hPgWUZW7e1PglR+hJOw6PA/RfCs2Gsg5nApFYvtO1L2A8xC1n3ne6DWQRewKEfQGSM7FeB5CSrUOUY0QN13D0DPEQuzANiAlhsxHAYNnSA9ci6gZ5Jq2VRbEVCCzWcRYrl2cKRAgk6gT9NPx9xBvbTqYeofBTyz9IlTaiDm3Zp6RckoxAePIScxzGKBEPTnVK5DRDMS+vtZyLMguBbTZv1BxpAw0UpbJDMQ7LAWCXIMl52EsGVAtKCmvv2YgQNYxY0PTbs97xh9SN07KemfITFHHw4nzntA3jO/kPfsZVSHSqhBpVYi0KkRaFSKtCpHWO4B8e/y4rC/f7/5/D8shXz4u7fHuCO0WQz4u7+4YLYY8LnZ8uTtCu+VrZOm59XiMNbJ7x1etM6tCpFUh0qoQac1A7s325L+P2t1/AoBhu90O04SWQ4b1ANsTP10Pa7XOD5/u4fMWbte74WlYDnlOAM3Jn5KBIesBHp7gXmXS5+WQz5/EQOz42TQVIgWyHgDyqfVGyPD0AOkZThxD+JrznBf7NpO+LodAszZbOHEF8nW9ZYEyZvnll9vtQErDNKH3/ZP9vKoQaVWItCpEWhUirQqRVoVIq0KkVSHSqhBpVYi0LgiygovodvXhAv71NIC/Xl2txPzpxNsbMuPm6vr23Ft9uLr5AdpbpSAPQyy7AAAAAElFTkSuQmCC", + "image": "tb-image:cHJvZ3Jlc3NfYmFyX3N5c3RlbV93aWRnZXRfaW1hZ2UucG5n:IlByb2dyZXNzIGJhciIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4685_40989)">
<rect width="200" height="160" rx="4" fill="white"/>
<g filter="url(#filter0_d_4685_40989)">
<rect width="200" height="160" rx="4" fill="white" shape-rendering="crispEdges"/>
<g filter="url(#filter1_b_4685_40989)">
<rect x="12" y="12" width="176" height="136" rx="4" fill="white" fill-opacity="0.76"/>
</g>
<path d="M16.4497 19.5532H14.0439V18.29H16.4497C16.8687 18.29 17.2072 18.2223 17.4653 18.0869C17.7235 17.9515 17.9118 17.7653 18.0303 17.5283C18.153 17.2871 18.2144 17.012 18.2144 16.7031C18.2144 16.4111 18.153 16.1382 18.0303 15.8843C17.9118 15.6261 17.7235 15.4188 17.4653 15.2622C17.2072 15.1056 16.8687 15.0273 16.4497 15.0273H14.5327V23H12.9395V13.7578H16.4497C17.1649 13.7578 17.7721 13.8848 18.2715 14.1387C18.7751 14.3883 19.158 14.7354 19.4204 15.1797C19.6828 15.6198 19.814 16.1234 19.814 16.6904C19.814 17.2871 19.6828 17.7992 19.4204 18.2266C19.158 18.654 18.7751 18.9819 18.2715 19.2104C17.7721 19.439 17.1649 19.5532 16.4497 19.5532ZM22.876 17.4395V23H21.3462V16.1318H22.8062L22.876 17.4395ZM24.9771 16.0874L24.9644 17.5093C24.8713 17.4924 24.7697 17.4797 24.6597 17.4712C24.5539 17.4627 24.4481 17.4585 24.3423 17.4585C24.0799 17.4585 23.8493 17.4966 23.6504 17.5728C23.4515 17.6447 23.2843 17.7505 23.1489 17.8901C23.0177 18.0256 22.9162 18.1906 22.8442 18.3853C22.7723 18.5799 22.73 18.7979 22.7173 19.0391L22.3682 19.0645C22.3682 18.6328 22.4105 18.2329 22.4951 17.8647C22.5798 17.4966 22.7067 17.1729 22.876 16.8936C23.0495 16.6143 23.2653 16.3963 23.5234 16.2397C23.7858 16.0832 24.0884 16.0049 24.4312 16.0049C24.5243 16.0049 24.6237 16.0133 24.7295 16.0303C24.8395 16.0472 24.922 16.0662 24.9771 16.0874ZM25.7285 19.6421V19.4961C25.7285 19.001 25.8005 18.5418 25.9443 18.1187C26.0882 17.6912 26.2956 17.321 26.5664 17.0078C26.8415 16.6904 27.1758 16.445 27.5693 16.2715C27.9671 16.0938 28.4157 16.0049 28.915 16.0049C29.4186 16.0049 29.8672 16.0938 30.2607 16.2715C30.6585 16.445 30.995 16.6904 31.27 17.0078C31.5451 17.321 31.7546 17.6912 31.8984 18.1187C32.0423 18.5418 32.1143 19.001 32.1143 19.4961V19.6421C32.1143 20.1372 32.0423 20.5964 31.8984 21.0195C31.7546 21.4427 31.5451 21.813 31.27 22.1304C30.995 22.4435 30.6606 22.689 30.2671 22.8667C29.8735 23.0402 29.4271 23.127 28.9277 23.127C28.4242 23.127 27.9735 23.0402 27.5757 22.8667C27.1821 22.689 26.8478 22.4435 26.5728 22.1304C26.2977 21.813 26.0882 21.4427 25.9443 21.0195C25.8005 20.5964 25.7285 20.1372 25.7285 19.6421ZM27.2583 19.4961V19.6421C27.2583 19.951 27.29 20.243 27.3535 20.5181C27.417 20.7931 27.5164 21.0343 27.6519 21.2417C27.7873 21.4491 27.9608 21.612 28.1724 21.7305C28.384 21.849 28.6357 21.9082 28.9277 21.9082C29.2113 21.9082 29.4567 21.849 29.6641 21.7305C29.8757 21.612 30.0492 21.4491 30.1846 21.2417C30.32 21.0343 30.4194 20.7931 30.4829 20.5181C30.5506 20.243 30.5845 19.951 30.5845 19.6421V19.4961C30.5845 19.1914 30.5506 18.9036 30.4829 18.6328C30.4194 18.3577 30.3179 18.1144 30.1782 17.9028C30.0428 17.6912 29.8693 17.5262 29.6577 17.4077C29.4504 17.285 29.2028 17.2236 28.915 17.2236C28.6273 17.2236 28.3776 17.285 28.166 17.4077C27.9587 17.5262 27.7873 17.6912 27.6519 17.9028C27.5164 18.1144 27.417 18.3577 27.3535 18.6328C27.29 18.9036 27.2583 19.1914 27.2583 19.4961ZM38.0454 16.1318H39.4355V22.8096C39.4355 23.4274 39.3044 23.9521 39.042 24.3838C38.7796 24.8154 38.4136 25.1434 37.9438 25.3677C37.4741 25.5962 36.9303 25.7104 36.3125 25.7104C36.0501 25.7104 35.7581 25.6724 35.4365 25.5962C35.1191 25.52 34.8102 25.3973 34.5098 25.228C34.2135 25.063 33.966 24.8451 33.7671 24.5742L34.4844 23.6729C34.7298 23.9648 35.0007 24.1785 35.2969 24.314C35.5931 24.4494 35.9041 24.5171 36.23 24.5171C36.5812 24.5171 36.8796 24.4515 37.125 24.3203C37.3747 24.1934 37.5672 24.005 37.7026 23.7554C37.8381 23.5057 37.9058 23.201 37.9058 22.8413V17.687L38.0454 16.1318ZM33.3799 19.6421V19.5088C33.3799 18.9883 33.4434 18.5143 33.5703 18.0869C33.6973 17.6553 33.8792 17.285 34.1162 16.9761C34.3532 16.6629 34.641 16.4238 34.9795 16.2588C35.318 16.0895 35.701 16.0049 36.1284 16.0049C36.5728 16.0049 36.9515 16.0853 37.2646 16.2461C37.582 16.4069 37.8465 16.6375 38.0581 16.938C38.2697 17.2342 38.4347 17.5897 38.5532 18.0044C38.6759 18.4149 38.7669 18.8719 38.8262 19.3755V19.8008C38.7712 20.2917 38.6781 20.7402 38.5469 21.1465C38.4157 21.5527 38.2422 21.904 38.0264 22.2002C37.8105 22.4964 37.5439 22.7249 37.2266 22.8857C36.9134 23.0465 36.5431 23.127 36.1157 23.127C35.6968 23.127 35.318 23.0402 34.9795 22.8667C34.6452 22.6932 34.3574 22.4499 34.1162 22.1367C33.8792 21.8236 33.6973 21.4554 33.5703 21.0322C33.4434 20.6048 33.3799 20.1414 33.3799 19.6421ZM34.9097 19.5088V19.6421C34.9097 19.9552 34.9393 20.2472 34.9985 20.5181C35.062 20.7889 35.1572 21.028 35.2842 21.2354C35.4154 21.4385 35.5804 21.5993 35.7793 21.7178C35.9824 21.832 36.2215 21.8892 36.4966 21.8892C36.8563 21.8892 37.1504 21.813 37.3789 21.6606C37.6117 21.5083 37.7894 21.3031 37.9121 21.0449C38.0391 20.7826 38.1279 20.4906 38.1787 20.1689V19.02C38.1533 18.7703 38.1004 18.5376 38.02 18.3218C37.9438 18.106 37.8402 17.9176 37.709 17.7568C37.5778 17.5918 37.4128 17.4648 37.2139 17.376C37.015 17.2829 36.7801 17.2363 36.5093 17.2363C36.2342 17.2363 35.9951 17.2956 35.792 17.4141C35.5889 17.5326 35.4217 17.6955 35.2905 17.9028C35.1636 18.1102 35.0684 18.3514 35.0049 18.6265C34.9414 18.9015 34.9097 19.1956 34.9097 19.5088ZM42.8086 17.4395V23H41.2788V16.1318H42.7388L42.8086 17.4395ZM44.9097 16.0874L44.897 17.5093C44.8039 17.4924 44.7023 17.4797 44.5923 17.4712C44.4865 17.4627 44.3807 17.4585 44.2749 17.4585C44.0125 17.4585 43.7819 17.4966 43.583 17.5728C43.3841 17.6447 43.217 17.7505 43.0815 17.8901C42.9504 18.0256 42.8488 18.1906 42.7769 18.3853C42.7049 18.5799 42.6626 18.7979 42.6499 19.0391L42.3008 19.0645C42.3008 18.6328 42.3431 18.2329 42.4277 17.8647C42.5124 17.4966 42.6393 17.1729 42.8086 16.8936C42.9821 16.6143 43.1979 16.3963 43.4561 16.2397C43.7184 16.0832 44.021 16.0049 44.3638 16.0049C44.4569 16.0049 44.5563 16.0133 44.6621 16.0303C44.7721 16.0472 44.8547 16.0662 44.9097 16.0874ZM49.019 23.127C48.5112 23.127 48.0521 23.0444 47.6416 22.8794C47.2354 22.7101 46.8883 22.4753 46.6006 22.1748C46.3171 21.8743 46.0991 21.521 45.9468 21.1147C45.7944 20.7085 45.7183 20.2705 45.7183 19.8008V19.5469C45.7183 19.0094 45.7965 18.5228 45.9531 18.0869C46.1097 17.651 46.3276 17.2786 46.6069 16.9697C46.8862 16.6566 47.2163 16.4175 47.5972 16.2524C47.978 16.0874 48.3906 16.0049 48.835 16.0049C49.3258 16.0049 49.7554 16.0874 50.1235 16.2524C50.4917 16.4175 50.7964 16.6502 51.0376 16.9507C51.283 17.2469 51.465 17.6003 51.5835 18.0107C51.7062 18.4212 51.7676 18.874 51.7676 19.3691V20.0229H46.4609V18.9248H50.2568V18.8042C50.2484 18.5291 50.1934 18.271 50.0918 18.0298C49.9945 17.7886 49.8442 17.5939 49.6411 17.4458C49.438 17.2977 49.1672 17.2236 48.8286 17.2236C48.5747 17.2236 48.3483 17.2786 48.1494 17.3887C47.9548 17.4945 47.7918 17.6489 47.6606 17.8521C47.5295 18.0552 47.4279 18.3006 47.356 18.5884C47.2882 18.8719 47.2544 19.1914 47.2544 19.5469V19.8008C47.2544 20.1012 47.2946 20.3805 47.375 20.6387C47.4596 20.8926 47.5824 21.1147 47.7432 21.3052C47.904 21.4956 48.0986 21.6458 48.3271 21.7559C48.5557 21.8617 48.8159 21.9146 49.1079 21.9146C49.4761 21.9146 49.804 21.8405 50.0918 21.6924C50.3796 21.5443 50.6292 21.3348 50.8408 21.064L51.647 21.8447C51.4989 22.0605 51.3063 22.2679 51.0693 22.4668C50.8324 22.6615 50.5425 22.8201 50.1997 22.9429C49.8612 23.0656 49.4676 23.127 49.019 23.127ZM57.064 21.1401C57.064 20.9878 57.0259 20.8503 56.9497 20.7275C56.8735 20.6006 56.7275 20.4863 56.5117 20.3848C56.3001 20.2832 55.987 20.1901 55.5723 20.1055C55.2083 20.0251 54.874 19.9299 54.5693 19.8198C54.2689 19.7056 54.0107 19.568 53.7949 19.4072C53.5791 19.2464 53.4119 19.056 53.2935 18.8359C53.175 18.6159 53.1157 18.362 53.1157 18.0742C53.1157 17.7949 53.1771 17.5304 53.2998 17.2808C53.4225 17.0311 53.5981 16.811 53.8267 16.6206C54.0552 16.4302 54.3324 16.2799 54.6582 16.1699C54.9883 16.0599 55.3564 16.0049 55.7627 16.0049C56.3382 16.0049 56.8312 16.1022 57.2417 16.2969C57.6564 16.4873 57.9738 16.7476 58.1938 17.0776C58.4139 17.4035 58.5239 17.7716 58.5239 18.1821H56.9941C56.9941 18.0002 56.9476 17.8309 56.8545 17.6743C56.7656 17.5135 56.6302 17.3844 56.4482 17.2871C56.2663 17.1855 56.0378 17.1348 55.7627 17.1348C55.5003 17.1348 55.2824 17.1771 55.1089 17.2617C54.9396 17.3421 54.8127 17.4479 54.728 17.5791C54.6476 17.7103 54.6074 17.8542 54.6074 18.0107C54.6074 18.125 54.6286 18.2287 54.6709 18.3218C54.7174 18.4106 54.7936 18.4932 54.8994 18.5693C55.0052 18.6413 55.1491 18.709 55.3311 18.7725C55.5173 18.8359 55.75 18.8973 56.0293 18.9565C56.554 19.0666 57.0047 19.2083 57.3813 19.3818C57.7622 19.5511 58.0542 19.7712 58.2573 20.042C58.4604 20.3086 58.562 20.6471 58.562 21.0576C58.562 21.3623 58.4964 21.6416 58.3652 21.8955C58.2383 22.1452 58.0521 22.3631 57.8066 22.5493C57.5612 22.7313 57.2671 22.873 56.9243 22.9746C56.5858 23.0762 56.2049 23.127 55.7817 23.127C55.1597 23.127 54.6328 23.0169 54.2012 22.7969C53.7695 22.5726 53.4416 22.2869 53.2173 21.9399C52.9972 21.5887 52.8872 21.2248 52.8872 20.8481H54.3662C54.3831 21.1317 54.4614 21.3581 54.6011 21.5273C54.745 21.6924 54.9227 21.813 55.1343 21.8892C55.3501 21.9611 55.5723 21.9971 55.8008 21.9971C56.0758 21.9971 56.3065 21.9611 56.4927 21.8892C56.6789 21.813 56.8206 21.7114 56.918 21.5845C57.0153 21.4533 57.064 21.3052 57.064 21.1401ZM64.0044 21.1401C64.0044 20.9878 63.9663 20.8503 63.8901 20.7275C63.814 20.6006 63.668 20.4863 63.4521 20.3848C63.2406 20.2832 62.9274 20.1901 62.5127 20.1055C62.1488 20.0251 61.8145 19.9299 61.5098 19.8198C61.2093 19.7056 60.9512 19.568 60.7354 19.4072C60.5195 19.2464 60.3524 19.056 60.2339 18.8359C60.1154 18.6159 60.0562 18.362 60.0562 18.0742C60.0562 17.7949 60.1175 17.5304 60.2402 17.2808C60.363 17.0311 60.5386 16.811 60.7671 16.6206C60.9956 16.4302 61.2728 16.2799 61.5986 16.1699C61.9287 16.0599 62.2969 16.0049 62.7031 16.0049C63.2786 16.0049 63.7716 16.1022 64.1821 16.2969C64.5968 16.4873 64.9142 16.7476 65.1343 17.0776C65.3543 17.4035 65.4644 17.7716 65.4644 18.1821H63.9346C63.9346 18.0002 63.888 17.8309 63.7949 17.6743C63.7061 17.5135 63.5706 17.3844 63.3887 17.2871C63.2067 17.1855 62.9782 17.1348 62.7031 17.1348C62.4408 17.1348 62.2228 17.1771 62.0493 17.2617C61.88 17.3421 61.7531 17.4479 61.6685 17.5791C61.5881 17.7103 61.5479 17.8542 61.5479 18.0107C61.5479 18.125 61.569 18.2287 61.6113 18.3218C61.6579 18.4106 61.734 18.4932 61.8398 18.5693C61.9456 18.6413 62.0895 18.709 62.2715 18.7725C62.4577 18.8359 62.6904 18.8973 62.9697 18.9565C63.4945 19.0666 63.9451 19.2083 64.3218 19.3818C64.7026 19.5511 64.9946 19.7712 65.1978 20.042C65.4009 20.3086 65.5024 20.6471 65.5024 21.0576C65.5024 21.3623 65.4368 21.6416 65.3057 21.8955C65.1787 22.1452 64.9925 22.3631 64.7471 22.5493C64.5016 22.7313 64.2075 22.873 63.8647 22.9746C63.5262 23.0762 63.1453 23.127 62.7222 23.127C62.1001 23.127 61.5732 23.0169 61.1416 22.7969C60.71 22.5726 60.382 22.2869 60.1577 21.9399C59.9377 21.5887 59.8276 21.2248 59.8276 20.8481H61.3066C61.3236 21.1317 61.4019 21.3581 61.5415 21.5273C61.6854 21.6924 61.8631 21.813 62.0747 21.8892C62.2905 21.9611 62.5127 21.9971 62.7412 21.9971C63.0163 21.9971 63.2469 21.9611 63.4331 21.8892C63.6193 21.813 63.7611 21.7114 63.8584 21.5845C63.9557 21.4533 64.0044 21.3052 64.0044 21.1401ZM70.5854 13.25H72.1152V21.5337L71.9692 23H70.5854V13.25ZM76.5967 19.5024V19.6357C76.5967 20.1436 76.5396 20.6112 76.4253 21.0386C76.3153 21.4618 76.146 21.8299 75.9175 22.1431C75.6932 22.4562 75.4139 22.6995 75.0796 22.873C74.7495 23.0423 74.3665 23.127 73.9307 23.127C73.5033 23.127 73.1309 23.0465 72.8135 22.8857C72.4961 22.7249 72.2295 22.4964 72.0137 22.2002C71.8021 21.904 71.6307 21.5506 71.4995 21.1401C71.3683 20.7297 71.2752 20.2769 71.2202 19.7817V19.3564C71.2752 18.8571 71.3683 18.4043 71.4995 17.998C71.6307 17.5876 71.8021 17.2342 72.0137 16.938C72.2295 16.6375 72.494 16.4069 72.8071 16.2461C73.1245 16.0853 73.4948 16.0049 73.918 16.0049C74.3581 16.0049 74.7453 16.0895 75.0796 16.2588C75.4181 16.4281 75.6995 16.6693 75.9238 16.9824C76.1481 17.2913 76.3153 17.6595 76.4253 18.0869C76.5396 18.5143 76.5967 18.9862 76.5967 19.5024ZM75.0669 19.6357V19.5024C75.0669 19.1935 75.0415 18.9036 74.9907 18.6328C74.9399 18.3577 74.8553 18.1165 74.7368 17.9092C74.6226 17.7018 74.466 17.5389 74.2671 17.4204C74.0724 17.2977 73.8291 17.2363 73.5371 17.2363C73.2663 17.2363 73.0335 17.2829 72.8389 17.376C72.6442 17.4691 72.4813 17.596 72.3501 17.7568C72.2189 17.9176 72.1152 18.1038 72.0391 18.3154C71.9671 18.527 71.9185 18.7555 71.8931 19.001V20.1499C71.9312 20.4673 72.0116 20.7593 72.1343 21.0259C72.2612 21.2882 72.439 21.4998 72.6675 21.6606C72.896 21.8172 73.1901 21.8955 73.5498 21.8955C73.8333 21.8955 74.0724 21.8384 74.2671 21.7241C74.4618 21.6099 74.6162 21.4512 74.7305 21.248C74.849 21.0407 74.9336 20.7995 74.9844 20.5244C75.0394 20.2493 75.0669 19.9531 75.0669 19.6357ZM82.0137 21.6226V18.3472C82.0137 18.1017 81.9692 17.8901 81.8804 17.7124C81.7915 17.5347 81.6561 17.3971 81.4741 17.2998C81.2964 17.2025 81.0721 17.1538 80.8013 17.1538C80.5516 17.1538 80.3358 17.1961 80.1538 17.2808C79.9718 17.3654 79.8301 17.4797 79.7285 17.6235C79.627 17.7674 79.5762 17.9303 79.5762 18.1123H78.0527C78.0527 17.8415 78.1183 17.5791 78.2495 17.3252C78.3807 17.0713 78.5711 16.8449 78.8208 16.646C79.0705 16.4471 79.3688 16.2905 79.7158 16.1763C80.0628 16.062 80.4521 16.0049 80.8838 16.0049C81.4001 16.0049 81.8571 16.0916 82.2549 16.2651C82.6569 16.4386 82.9722 16.701 83.2007 17.0522C83.4334 17.3993 83.5498 17.8351 83.5498 18.3599V21.4131C83.5498 21.7262 83.571 22.0076 83.6133 22.2573C83.6598 22.5028 83.7254 22.7165 83.8101 22.8984V23H82.2422C82.1702 22.835 82.1131 22.6255 82.0708 22.3716C82.0327 22.1134 82.0137 21.8638 82.0137 21.6226ZM82.2358 18.8232L82.2485 19.769H81.1504C80.8669 19.769 80.6172 19.7965 80.4014 19.8516C80.1855 19.9023 80.0057 19.9785 79.8618 20.0801C79.7179 20.1816 79.61 20.3044 79.5381 20.4482C79.4661 20.5921 79.4302 20.755 79.4302 20.937C79.4302 21.119 79.4725 21.2861 79.5571 21.4385C79.6418 21.5866 79.7645 21.703 79.9253 21.7876C80.0903 21.8722 80.2892 21.9146 80.522 21.9146C80.8351 21.9146 81.1081 21.8511 81.3408 21.7241C81.5778 21.5929 81.764 21.4342 81.8994 21.248C82.0348 21.0576 82.1068 20.8778 82.1152 20.7085L82.6104 21.3877C82.5596 21.5612 82.4728 21.7474 82.3501 21.9463C82.2274 22.1452 82.0666 22.3356 81.8677 22.5176C81.673 22.6953 81.4382 22.8413 81.1631 22.9556C80.8923 23.0698 80.5791 23.127 80.2236 23.127C79.7751 23.127 79.3752 23.0381 79.0239 22.8604C78.6727 22.6784 78.3976 22.4351 78.1987 22.1304C77.9998 21.8215 77.9004 21.4723 77.9004 21.083C77.9004 20.7191 77.9681 20.3975 78.1035 20.1182C78.2432 19.8346 78.4463 19.5977 78.7129 19.4072C78.9837 19.2168 79.3138 19.0729 79.7031 18.9756C80.0924 18.874 80.5368 18.8232 81.0361 18.8232H82.2358ZM86.9355 17.4395V23H85.4058V16.1318H86.8657L86.9355 17.4395ZM89.0366 16.0874L89.0239 17.5093C88.9308 17.4924 88.8293 17.4797 88.7192 17.4712C88.6134 17.4627 88.5076 17.4585 88.4019 17.4585C88.1395 17.4585 87.9089 17.4966 87.71 17.5728C87.5111 17.6447 87.3439 17.7505 87.2085 17.8901C87.0773 18.0256 86.9757 18.1906 86.9038 18.3853C86.8319 18.5799 86.7896 18.7979 86.7769 19.0391L86.4277 19.0645C86.4277 18.6328 86.4701 18.2329 86.5547 17.8647C86.6393 17.4966 86.7663 17.1729 86.9355 16.8936C87.109 16.6143 87.3249 16.3963 87.583 16.2397C87.8454 16.0832 88.1479 16.0049 88.4907 16.0049C88.5838 16.0049 88.6833 16.0133 88.7891 16.0303C88.8991 16.0472 88.9816 16.0662 89.0366 16.0874Z" fill="black" fill-opacity="0.87"/>
<path d="M16.6055 97.1914H18.293C18.9492 97.1914 19.4922 97.0781 19.9219 96.8516C20.3594 96.625 20.6836 96.3125 20.8945 95.9141C21.1055 95.5156 21.2109 95.0586 21.2109 94.543C21.2109 94.0039 21.1133 93.543 20.918 93.1602C20.7305 92.7695 20.4414 92.4688 20.0508 92.2578C19.668 92.0469 19.1797 91.9414 18.5859 91.9414C18.0859 91.9414 17.6328 92.043 17.2266 92.2461C16.8281 92.4414 16.5117 92.7227 16.2773 93.0898C16.043 93.4492 15.9258 93.8789 15.9258 94.3789H13.0898C13.0898 93.4727 13.3281 92.668 13.8047 91.9648C14.2812 91.2617 14.9297 90.7109 15.75 90.3125C16.5781 89.9062 17.5078 89.7031 18.5391 89.7031C19.6406 89.7031 20.6016 89.8867 21.4219 90.2539C22.25 90.6133 22.8945 91.1523 23.3555 91.8711C23.8164 92.5898 24.0469 93.4805 24.0469 94.543C24.0469 95.0273 23.9336 95.5195 23.707 96.0195C23.4805 96.5195 23.1445 96.9766 22.6992 97.3906C22.2539 97.7969 21.6992 98.1289 21.0352 98.3867C20.3711 98.6367 19.6016 98.7617 18.7266 98.7617H16.6055V97.1914ZM16.6055 99.3945V97.8477H18.7266C19.7266 97.8477 20.5781 97.9648 21.2812 98.1992C21.9922 98.4336 22.5703 98.7578 23.0156 99.1719C23.4609 99.5781 23.7852 100.043 23.9883 100.566C24.1992 101.09 24.3047 101.645 24.3047 102.23C24.3047 103.027 24.1602 103.738 23.8711 104.363C23.5898 104.98 23.1875 105.504 22.6641 105.934C22.1406 106.363 21.5273 106.688 20.8242 106.906C20.1289 107.125 19.3711 107.234 18.5508 107.234C17.8164 107.234 17.1133 107.133 16.4414 106.93C15.7695 106.727 15.168 106.426 14.6367 106.027C14.1055 105.621 13.6836 105.117 13.3711 104.516C13.0664 103.906 12.9141 103.203 12.9141 102.406H15.7383C15.7383 102.914 15.8555 103.363 16.0898 103.754C16.332 104.137 16.668 104.438 17.0977 104.656C17.5352 104.875 18.0352 104.984 18.5977 104.984C19.1914 104.984 19.7031 104.879 20.1328 104.668C20.5625 104.457 20.8906 104.145 21.1172 103.73C21.3516 103.316 21.4688 102.816 21.4688 102.23C21.4688 101.566 21.3398 101.027 21.082 100.613C20.8242 100.199 20.457 99.8945 19.9805 99.6992C19.5039 99.4961 18.9414 99.3945 18.293 99.3945H16.6055ZM35.4609 89.832H35.8125V92.1406H35.6133C34.6055 92.1406 33.7344 92.2969 33 92.6094C32.2734 92.9219 31.6758 93.3516 31.207 93.8984C30.7383 94.4453 30.3867 95.0859 30.1523 95.8203C29.9258 96.5469 29.8125 97.3203 29.8125 98.1406V100.824C29.8125 101.504 29.8867 102.105 30.0352 102.629C30.1836 103.145 30.3906 103.578 30.6562 103.93C30.9297 104.273 31.2422 104.535 31.5938 104.715C31.9453 104.895 32.3242 104.984 32.7305 104.984C33.1523 104.984 33.5352 104.898 33.8789 104.727C34.2227 104.547 34.5156 104.301 34.7578 103.988C35 103.676 35.1836 103.305 35.3086 102.875C35.4336 102.445 35.4961 101.977 35.4961 101.469C35.4961 100.984 35.4336 100.531 35.3086 100.109C35.1914 99.6797 35.0156 99.3047 34.7812 98.9844C34.5469 98.6562 34.2539 98.4023 33.9023 98.2227C33.5586 98.0352 33.1602 97.9414 32.707 97.9414C32.1445 97.9414 31.6328 98.0742 31.1719 98.3398C30.7188 98.6055 30.3516 98.9531 30.0703 99.3828C29.7969 99.8047 29.6484 100.254 29.625 100.73L28.5469 100.379C28.6094 99.6523 28.7695 99 29.0273 98.4219C29.293 97.8438 29.6406 97.3516 30.0703 96.9453C30.5 96.5391 30.9961 96.2305 31.5586 96.0195C32.1289 95.8008 32.7539 95.6914 33.4336 95.6914C34.2617 95.6914 34.9805 95.8477 35.5898 96.1602C36.1992 96.4727 36.7031 96.8984 37.1016 97.4375C37.5078 97.9688 37.8086 98.5781 38.0039 99.2656C38.207 99.9453 38.3086 100.656 38.3086 101.398C38.3086 102.219 38.1836 102.984 37.9336 103.695C37.6836 104.398 37.3164 105.016 36.832 105.547C36.3555 106.078 35.7734 106.492 35.0859 106.789C34.4062 107.086 33.6328 107.234 32.7656 107.234C31.8516 107.234 31.0352 107.059 30.3164 106.707C29.6055 106.355 29 105.871 28.5 105.254C28.0078 104.637 27.6328 103.926 27.375 103.121C27.1172 102.316 26.9883 101.465 26.9883 100.566V99.3945C26.9883 98.0977 27.1523 96.875 27.4805 95.7266C27.8086 94.5703 28.3125 93.5508 28.9922 92.668C29.6797 91.7852 30.5586 91.0938 31.6289 90.5938C32.6992 90.0859 33.9766 89.832 35.4609 89.832Z" fill="black" fill-opacity="0.87"/>
<path d="M42.7178 99.4873V98.9609C42.7178 98.5827 42.7998 98.2386 42.9639 97.9287C43.1279 97.6188 43.3626 97.3704 43.668 97.1836C43.9733 96.9967 44.3356 96.9033 44.7549 96.9033C45.1833 96.9033 45.5479 96.9967 45.8486 97.1836C46.154 97.3704 46.3887 97.6188 46.5527 97.9287C46.7168 98.2386 46.7988 98.5827 46.7988 98.9609V99.4873C46.7988 99.8564 46.7168 100.196 46.5527 100.506C46.3932 100.816 46.1608 101.064 45.8555 101.251C45.5547 101.438 45.1924 101.531 44.7686 101.531C44.3447 101.531 43.9779 101.438 43.668 101.251C43.3626 101.064 43.1279 100.816 42.9639 100.506C42.7998 100.196 42.7178 99.8564 42.7178 99.4873ZM43.668 98.9609V99.4873C43.668 99.6969 43.7067 99.8952 43.7842 100.082C43.8662 100.269 43.9893 100.422 44.1533 100.54C44.3174 100.654 44.5225 100.711 44.7686 100.711C45.0146 100.711 45.2174 100.654 45.377 100.54C45.5365 100.422 45.6549 100.269 45.7324 100.082C45.8099 99.8952 45.8486 99.6969 45.8486 99.4873V98.9609C45.8486 98.7467 45.8076 98.5462 45.7256 98.3594C45.6481 98.168 45.5273 98.0153 45.3633 97.9014C45.2038 97.7829 45.001 97.7236 44.7549 97.7236C44.5133 97.7236 44.3105 97.7829 44.1465 97.9014C43.987 98.0153 43.8662 98.168 43.7842 98.3594C43.7067 98.5462 43.668 98.7467 43.668 98.9609ZM47.5645 105.093V104.56C47.5645 104.186 47.6465 103.844 47.8105 103.534C47.9746 103.224 48.2093 102.976 48.5146 102.789C48.82 102.602 49.1823 102.509 49.6016 102.509C50.0299 102.509 50.3945 102.602 50.6953 102.789C51.0007 102.976 51.2354 103.224 51.3994 103.534C51.5635 103.844 51.6455 104.186 51.6455 104.56V105.093C51.6455 105.466 51.5635 105.808 51.3994 106.118C51.2399 106.428 51.0075 106.676 50.7021 106.863C50.4014 107.05 50.0391 107.144 49.6152 107.144C49.1914 107.144 48.8268 107.05 48.5215 106.863C48.2161 106.676 47.9792 106.428 47.8105 106.118C47.6465 105.808 47.5645 105.466 47.5645 105.093ZM48.5146 104.56V105.093C48.5146 105.302 48.5534 105.503 48.6309 105.694C48.7129 105.881 48.8359 106.034 49 106.152C49.1641 106.266 49.3691 106.323 49.6152 106.323C49.8613 106.323 50.0641 106.266 50.2236 106.152C50.3877 106.034 50.5085 105.881 50.5859 105.694C50.6634 105.507 50.7021 105.307 50.7021 105.093V104.56C50.7021 104.345 50.6611 104.145 50.5791 103.958C50.5016 103.771 50.3809 103.621 50.2168 103.507C50.0573 103.388 49.8522 103.329 49.6016 103.329C49.36 103.329 49.1572 103.388 48.9932 103.507C48.8337 103.621 48.7129 103.771 48.6309 103.958C48.5534 104.145 48.5146 104.345 48.5146 104.56ZM49.916 98.4619L45.0557 106.241L44.3447 105.79L49.2051 98.0107L49.916 98.4619Z" fill="black" fill-opacity="0.87"/>
<rect x="12" y="123" width="176" height="5" rx="2.5" fill="black" fill-opacity="0.04"/>
<rect width="51" height="5" rx="2.5" transform="matrix(-1 0 0 1 63 123)" fill="#3F52DD"/>
<path d="M17.5591 139.467V140.659C17.5591 141.3 17.5018 141.841 17.3872 142.281C17.2726 142.722 17.1079 143.076 16.8931 143.345C16.6782 143.613 16.4186 143.808 16.1143 143.93C15.8135 144.048 15.4733 144.107 15.0938 144.107C14.793 144.107 14.5155 144.07 14.2612 143.995C14.007 143.919 13.7778 143.799 13.5737 143.635C13.3732 143.466 13.2013 143.248 13.0581 142.979C12.9149 142.711 12.8057 142.385 12.7305 142.002C12.6553 141.619 12.6177 141.171 12.6177 140.659V139.467C12.6177 138.826 12.675 138.289 12.7896 137.855C12.9077 137.422 13.0742 137.075 13.2891 136.813C13.5039 136.549 13.7617 136.359 14.0625 136.244C14.3669 136.13 14.707 136.072 15.083 136.072C15.3874 136.072 15.6667 136.11 15.9209 136.185C16.1787 136.257 16.4079 136.373 16.6084 136.534C16.8089 136.692 16.979 136.903 17.1187 137.168C17.2619 137.429 17.3711 137.75 17.4463 138.129C17.5215 138.509 17.5591 138.955 17.5591 139.467ZM16.5601 140.82V139.3C16.5601 138.949 16.5386 138.641 16.4956 138.376C16.4562 138.108 16.3971 137.879 16.3184 137.689C16.2396 137.499 16.1393 137.345 16.0176 137.227C15.8994 137.109 15.7616 137.023 15.604 136.969C15.45 136.912 15.2764 136.883 15.083 136.883C14.8467 136.883 14.6372 136.928 14.4546 137.018C14.272 137.104 14.118 137.241 13.9927 137.431C13.8709 137.621 13.7778 137.87 13.7134 138.178C13.6489 138.486 13.6167 138.86 13.6167 139.3V140.82C13.6167 141.171 13.6364 141.481 13.6758 141.75C13.7188 142.018 13.7814 142.251 13.8638 142.448C13.9461 142.641 14.0464 142.8 14.1646 142.926C14.2827 143.051 14.4188 143.144 14.5728 143.205C14.7303 143.262 14.904 143.291 15.0938 143.291C15.3372 143.291 15.5503 143.244 15.7329 143.151C15.9155 143.058 16.0677 142.913 16.1895 142.716C16.3148 142.516 16.4079 142.26 16.4688 141.948C16.5296 141.633 16.5601 141.257 16.5601 140.82Z" fill="black" fill-opacity="0.54"/>
<path d="M171.916 136.137V144H170.922V137.377L168.918 138.108V137.211L171.76 136.137H171.916ZM179.997 139.467V140.659C179.997 141.3 179.939 141.841 179.825 142.281C179.71 142.722 179.545 143.076 179.331 143.345C179.116 143.613 178.856 143.808 178.552 143.93C178.251 144.048 177.911 144.107 177.531 144.107C177.23 144.107 176.953 144.07 176.699 143.995C176.444 143.919 176.215 143.799 176.011 143.635C175.811 143.466 175.639 143.248 175.496 142.979C175.352 142.711 175.243 142.385 175.168 142.002C175.093 141.619 175.055 141.171 175.055 140.659V139.467C175.055 138.826 175.112 138.289 175.227 137.855C175.345 137.422 175.512 137.075 175.727 136.813C175.941 136.549 176.199 136.359 176.5 136.244C176.804 136.13 177.145 136.072 177.521 136.072C177.825 136.072 178.104 136.11 178.358 136.185C178.616 136.257 178.845 136.373 179.046 136.534C179.246 136.692 179.417 136.903 179.556 137.168C179.699 137.429 179.809 137.75 179.884 138.129C179.959 138.509 179.997 138.955 179.997 139.467ZM178.998 140.82V139.3C178.998 138.949 178.976 138.641 178.933 138.376C178.894 138.108 178.835 137.879 178.756 137.689C178.677 137.499 178.577 137.345 178.455 137.227C178.337 137.109 178.199 137.023 178.042 136.969C177.888 136.912 177.714 136.883 177.521 136.883C177.284 136.883 177.075 136.928 176.892 137.018C176.709 137.104 176.556 137.241 176.43 137.431C176.308 137.621 176.215 137.87 176.151 138.178C176.086 138.486 176.054 138.86 176.054 139.3V140.82C176.054 141.171 176.074 141.481 176.113 141.75C176.156 142.018 176.219 142.251 176.301 142.448C176.384 142.641 176.484 142.8 176.602 142.926C176.72 143.051 176.856 143.144 177.01 143.205C177.168 143.262 177.341 143.291 177.531 143.291C177.775 143.291 177.988 143.244 178.17 143.151C178.353 143.058 178.505 142.913 178.627 142.716C178.752 142.516 178.845 142.26 178.906 141.948C178.967 141.633 178.998 141.257 178.998 140.82ZM186.434 139.467V140.659C186.434 141.3 186.377 141.841 186.262 142.281C186.148 142.722 185.983 143.076 185.768 143.345C185.553 143.613 185.294 143.808 184.989 143.93C184.688 144.048 184.348 144.107 183.969 144.107C183.668 144.107 183.39 144.07 183.136 143.995C182.882 143.919 182.653 143.799 182.449 143.635C182.248 143.466 182.076 143.248 181.933 142.979C181.79 142.711 181.681 142.385 181.605 142.002C181.53 141.619 181.493 141.171 181.493 140.659V139.467C181.493 138.826 181.55 138.289 181.665 137.855C181.783 137.422 181.949 137.075 182.164 136.813C182.379 136.549 182.637 136.359 182.938 136.244C183.242 136.13 183.582 136.072 183.958 136.072C184.262 136.072 184.542 136.11 184.796 136.185C185.054 136.257 185.283 136.373 185.483 136.534C185.684 136.692 185.854 136.903 185.994 137.168C186.137 137.429 186.246 137.75 186.321 138.129C186.396 138.509 186.434 138.955 186.434 139.467ZM185.435 140.82V139.3C185.435 138.949 185.414 138.641 185.371 138.376C185.331 138.108 185.272 137.879 185.193 137.689C185.115 137.499 185.014 137.345 184.893 137.227C184.774 137.109 184.637 137.023 184.479 136.969C184.325 136.912 184.151 136.883 183.958 136.883C183.722 136.883 183.512 136.928 183.33 137.018C183.147 137.104 182.993 137.241 182.868 137.431C182.746 137.621 182.653 137.87 182.588 138.178C182.524 138.486 182.492 138.86 182.492 139.3V140.82C182.492 141.171 182.511 141.481 182.551 141.75C182.594 142.018 182.656 142.251 182.739 142.448C182.821 142.641 182.921 142.8 183.04 142.926C183.158 143.051 183.294 143.144 183.448 143.205C183.605 143.262 183.779 143.291 183.969 143.291C184.212 143.291 184.425 143.244 184.608 143.151C184.791 143.058 184.943 142.913 185.064 142.716C185.19 142.516 185.283 142.26 185.344 141.948C185.405 141.633 185.435 141.257 185.435 140.82Z" fill="black" fill-opacity="0.54"/>
</g>
</g>
<rect x="0.5" y="0.5" width="199" height="159" rx="3.5" stroke="black" stroke-opacity="0.12"/>
<defs>
<filter id="filter0_d_4685_40989" x="-8" y="-4" width="216" height="176" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="4"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4685_40989"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4685_40989" result="shape"/>
</filter>
<filter id="filter1_b_4685_40989" x="6" y="6" width="188" height="148" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feGaussianBlur in="BackgroundImageFix" stdDeviation="3"/>
<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_4685_40989"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_4685_40989" result="shape"/>
</filter>
<clipPath id="clip0_4685_40989">
<rect width="200" height="160" rx="4" fill="white"/>
</clipPath>
</defs>
</svg>
", "description": "Displays any value reading as a horizontal progress bar. Allows to configure value range, bar colors, and other settings.", "descriptor": { "type": "latest", @@ -19,7 +19,6 @@ "basicModeDirective": "tb-progress-bar-basic-config", "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"humidity\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"var value = prevValue + Math.random() * 7;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 0;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"layout\":\"default\",\"autoScale\":true,\"showValue\":true,\"valueFont\":{\"family\":\"Roboto\",\"size\":24,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"32px\"},\"valueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"tickMin\":0,\"tickMax\":100,\"showTicks\":true,\"ticksFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"ticksColor\":\"rgba(0,0,0,0.54)\",\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Progress bar\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":\"%\",\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"mdi:water-percent\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"18px\",\"timewindowStyle\":{\"showIcon\":true,\"iconSize\":\"14px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":null,\"weight\":null,\"style\":null,\"lineHeight\":\"1\"},\"color\":null},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}" }, - "externalId": null, "tags": [ "progress", "loading", diff --git a/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json b/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json index e19ff918be..a17d2ee031 100644 --- a/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json +++ b/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json @@ -2,7 +2,7 @@ "fqn": "simple_value_and_chart_card", "name": "Simple Value and chart card", "deprecated": false, - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAflBMVEUAAADg4ODg4ODf39/////g4OAhISHj4+M/Ut09PT2srKx0dHSQkJDn6fvHx8fx8fEvLy9XaOHP1PdYWFi3vvKenp7z9P3V1dW6urqCgoKHk+pvfeVLXd/b3/lmZmaTnuyrs/DDyfWfqO5jc+Orq6tLS0ufqe5LXN97iOhKSkrA29V9AAAABHRSTlMA77cggcfpsAAABRRJREFUeNrsz0EBACEIADBBedu/7RlDua3BBgAAAAAAwO/MjHpdzvOIvZ63Y45s8DiTHLVaiC6RErmMyG0+9stdRXIYiKLJ5RZ6IBUIITlx1A7m/39wq3A3y/ZqN5jA0/M4ILnqWhYc5MD+EXk1vqZIlTv4fPwhUnin4B1IHLie9YnEGFVtEryDwozLWYs4IZxOPUcAJVoxIT0LIFGmpY5dzyB2oOQ8feY+MWIFZrQxRxZPu2DNJSKiVB5AYgjkzkAdiAyqbEA9LAjiAQOyr8nYlNqsKUAj4EsLEpWeLLhCxGdBZkeyIeSwZkPkXtFYsHmqzUWK1JBgaT1frd8i3KRGi0QDVlwiMthEBpOJyBmJNZERmGZ0qIgcegZAHaVRnkV8n51FxPdYcYVIIZ22EPGCJ3eRrhp0LdLofKDIYBJnIVK4QYM4jyAB6V8nMsTAkitEoCpArM8iGyyZNm5AGadIZAbaQ6RbVMNDJPsTMrHiGpEbQwuczyJsB70JXmynSLVGlQOVemDQu4dIfbOF+oYL+Eukdziy7VsBZq5nVPNEZN92DyB9Tzdg5OGNhV7htifL7M7Mj3086xX/5fqPRj+Al+VbipRU8LJ8zf+Rz8wv9ukYBWIYBqJoO40KCePCjhBJYe/9T7ikCCHJBTTg32m6B/aCZGtBsrUg2VqQbOWD+L5bpYdIbDjrhRsS2KK426HoQgxpiOtRlalCCwkc9yGqlRRip+POEaSQrs97QCghjvIc6vxRQtrnTwwYIUTQ3lOdnRDSIJ9twOggf3bNqElVEAzDNwx+CpggUimW5s457f//g0eWU5gszTi7hRc+F/lmTuMz34eQZgvil2T1IkJeeuZfovySrFuk02ComZv+bEH8kqxBhAnRBsZD0zPVnrnubx6afW8MIraIumgY4Z0KL0UYh7odNxd9M/LgTWQRxqHphJBX8BZ/0i1F1BkMT5a6EkRUEca5sElwzuYfTd/1l0vXojADVzFFrq7n2d/GmzAW0MIwNVFCyp69TUSA9K+hrrEWIV1zKtFoMAzyTSI1D11DGR/QQgSHq2wZ688a9LlnTHQD8At7tYg/TXfQuZbXbPnX/eFg0LW4y9VuFgqIHI6E5jbuMpcNFcmQJafkmCVPuqFFU5pbO6nGOi2m7aUU6sHOqIigSJJiQ7lzmZhsOOJPTExISvwFRQGGWfuoGngnTG/o7jfvuHCoAyK7FBc0I+YcjUda2WwdcYUo3lnBE6XjaxX+iTRDDjCiG4Z+FdkFRDL7d4sSF4/ZsMc5ys2u0S23z9CLXXBF7sGEbBV6Db7ICX+aTYWxyaXJdMyWNCVpOm4LTOxoskI+vEZvxm+tJLGjIb1nMmZLQlIy7soxPtiDKd3/YFXxShE34sk8OzJbiDCcowh4IrYIySx74yhMBxK9k7AItb3j8iIRAVcUASPie9CH7Ivsn9WDMxQBX+Rjcu6Vy47DvUh5Pi+NaKBRKAK+yB7j4+SUKfLY3Y7I522nzsB7FANfZF9gMsseJS7shXk2WKSGc5xy+CKJWXdkhvwrZ//zA0mB0yrPysd6tQ00LYqFv0S5QRCd5Ef2qd1/nN5qAN2hWPgiObnxgQ6TPCP5OJWn46RQPf95V63hqa6EQaCFrFKESRSdtdzE3kQ2kbWyiayNTWRtbCJrYxNZG//auQMaAEAYiIFZwvxbZjLgd+egBirkNUEhdSJ0znInZoI0W6r+Xc2WCgAAAAAAYJsLnGVmvd/WiIIAAAAASUVORK5CYII=", + "image": "tb-image:c2ltcGxlX3ZhbHVlX2FuZF9jaGFydF9jYXJkX3N5c3RlbV93aWRnZXRfaW1hZ2UucG5n:IlNpbXBsZSBWYWx1ZSBhbmQgY2hhcnQgY2FyZCIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect y="32" width="200" height="96" rx="4" fill="white"/>
<rect x="0.5" y="32.5" width="199" height="95" rx="3.5" stroke="black" stroke-opacity="0.12"/>
<path d="M16.7417 45.7578V55H15.1611V45.7578H16.7417ZM19.6426 45.7578V47.0273H12.2856V45.7578H19.6426ZM23.3774 55.127C22.8696 55.127 22.4105 55.0444 22 54.8794C21.5938 54.7101 21.2467 54.4753 20.959 54.1748C20.6755 53.8743 20.4575 53.521 20.3052 53.1147C20.1528 52.7085 20.0767 52.2705 20.0767 51.8008V51.5469C20.0767 51.0094 20.1549 50.5228 20.3115 50.0869C20.4681 49.651 20.686 49.2786 20.9653 48.9697C21.2446 48.6566 21.5747 48.4175 21.9556 48.2524C22.3364 48.0874 22.749 48.0049 23.1934 48.0049C23.6842 48.0049 24.1138 48.0874 24.4819 48.2524C24.8501 48.4175 25.1548 48.6502 25.396 48.9507C25.6414 49.2469 25.8234 49.6003 25.9419 50.0107C26.0646 50.4212 26.126 50.874 26.126 51.3691V52.0229H20.8193V50.9248H24.6152V50.8042C24.6068 50.5291 24.5518 50.271 24.4502 50.0298C24.3529 49.7886 24.2026 49.5939 23.9995 49.4458C23.7964 49.2977 23.5256 49.2236 23.187 49.2236C22.9331 49.2236 22.7067 49.2786 22.5078 49.3887C22.3132 49.4945 22.1502 49.6489 22.019 49.8521C21.8879 50.0552 21.7863 50.3006 21.7144 50.5884C21.6466 50.8719 21.6128 51.1914 21.6128 51.5469V51.8008C21.6128 52.1012 21.653 52.3805 21.7334 52.6387C21.818 52.8926 21.9408 53.1147 22.1016 53.3052C22.2624 53.4956 22.457 53.6458 22.6855 53.7559C22.9141 53.8617 23.1743 53.9146 23.4663 53.9146C23.8345 53.9146 24.1624 53.8405 24.4502 53.6924C24.738 53.5443 24.9876 53.3348 25.1992 53.064L26.0054 53.8447C25.8573 54.0605 25.6647 54.2679 25.4277 54.4668C25.1908 54.6615 24.9009 54.8201 24.5581 54.9429C24.2196 55.0656 23.826 55.127 23.3774 55.127ZM29.0991 49.5283V55H27.5693V48.1318H29.0103L29.0991 49.5283ZM28.8516 51.312L28.3311 51.3057C28.3311 50.8317 28.3903 50.3937 28.5088 49.9917C28.6273 49.5897 28.8008 49.2406 29.0293 48.9443C29.2578 48.6439 29.5413 48.4132 29.8799 48.2524C30.2227 48.0874 30.6183 48.0049 31.0669 48.0049C31.38 48.0049 31.6657 48.0514 31.9238 48.1445C32.1862 48.2334 32.4126 48.3752 32.603 48.5698C32.7977 48.7645 32.9458 49.0142 33.0474 49.3188C33.1532 49.6235 33.2061 49.9917 33.2061 50.4233V55H31.6763V50.5566C31.6763 50.2223 31.6255 49.96 31.5239 49.7695C31.4266 49.5791 31.2848 49.4437 31.0986 49.3633C30.9167 49.2786 30.6987 49.2363 30.4448 49.2363C30.1571 49.2363 29.9116 49.2913 29.7085 49.4014C29.5096 49.5114 29.3467 49.6616 29.2197 49.8521C29.0928 50.0425 28.9997 50.2625 28.9404 50.5122C28.8812 50.7619 28.8516 51.0285 28.8516 51.312ZM33.1108 50.9058L32.3936 51.0645C32.3936 50.6497 32.4507 50.2583 32.5649 49.8901C32.6834 49.5177 32.8548 49.1919 33.0791 48.9126C33.3076 48.6291 33.589 48.4069 33.9233 48.2461C34.2576 48.0853 34.6406 48.0049 35.0723 48.0049C35.4235 48.0049 35.7367 48.0535 36.0117 48.1509C36.291 48.244 36.528 48.3921 36.7227 48.5952C36.9173 48.7983 37.0654 49.0628 37.167 49.3887C37.2686 49.7103 37.3193 50.0996 37.3193 50.5566V55H35.7832V50.5503C35.7832 50.2033 35.7324 49.9346 35.6309 49.7441C35.5335 49.5537 35.3939 49.4225 35.2119 49.3506C35.0299 49.2744 34.812 49.2363 34.5581 49.2363C34.3211 49.2363 34.1117 49.2808 33.9297 49.3696C33.752 49.4543 33.6017 49.5749 33.479 49.7314C33.3563 49.8838 33.2632 50.0594 33.1997 50.2583C33.1405 50.4572 33.1108 50.673 33.1108 50.9058ZM40.6797 49.4521V57.6406H39.1499V48.1318H40.5591L40.6797 49.4521ZM45.1548 51.5024V51.6357C45.1548 52.1351 45.0955 52.5985 44.9771 53.0259C44.8628 53.4491 44.6914 53.8193 44.4629 54.1367C44.2386 54.4499 43.9614 54.6932 43.6313 54.8667C43.3013 55.0402 42.9204 55.127 42.4888 55.127C42.0614 55.127 41.6868 55.0487 41.3652 54.8921C41.0479 54.7313 40.7791 54.5049 40.5591 54.2129C40.339 53.9209 40.1613 53.5781 40.0259 53.1846C39.8947 52.7868 39.8016 52.3509 39.7466 51.877V51.3628C39.8016 50.8592 39.8947 50.4022 40.0259 49.9917C40.1613 49.5812 40.339 49.2279 40.5591 48.9316C40.7791 48.6354 41.0479 48.4069 41.3652 48.2461C41.6826 48.0853 42.0529 48.0049 42.4761 48.0049C42.9077 48.0049 43.2907 48.0895 43.625 48.2588C43.9593 48.4238 44.2407 48.6608 44.4692 48.9697C44.6978 49.2744 44.8691 49.6426 44.9834 50.0742C45.0977 50.5016 45.1548 50.9777 45.1548 51.5024ZM43.625 51.6357V51.5024C43.625 51.1851 43.5954 50.891 43.5361 50.6201C43.4769 50.3451 43.3838 50.1038 43.2568 49.8965C43.1299 49.6891 42.967 49.5283 42.7681 49.4141C42.5734 49.2956 42.3385 49.2363 42.0635 49.2363C41.7926 49.2363 41.5599 49.2829 41.3652 49.376C41.1706 49.4648 41.0076 49.5897 40.8765 49.7505C40.7453 49.9113 40.6437 50.0996 40.5718 50.3154C40.4998 50.527 40.4491 50.7576 40.4194 51.0073V52.2388C40.4702 52.5435 40.557 52.8228 40.6797 53.0767C40.8024 53.3306 40.9759 53.5337 41.2002 53.686C41.4287 53.8341 41.7207 53.9082 42.0762 53.9082C42.3512 53.9082 42.5861 53.849 42.7808 53.7305C42.9754 53.612 43.1341 53.4491 43.2568 53.2417C43.3838 53.0301 43.4769 52.7868 43.5361 52.5117C43.5954 52.2367 43.625 51.9447 43.625 51.6357ZM49.7339 55.127C49.2261 55.127 48.7669 55.0444 48.3564 54.8794C47.9502 54.7101 47.6032 54.4753 47.3154 54.1748C47.0319 53.8743 46.814 53.521 46.6616 53.1147C46.5093 52.7085 46.4331 52.2705 46.4331 51.8008V51.5469C46.4331 51.0094 46.5114 50.5228 46.668 50.0869C46.8245 49.651 47.0425 49.2786 47.3218 48.9697C47.6011 48.6566 47.9312 48.4175 48.312 48.2524C48.6929 48.0874 49.1055 48.0049 49.5498 48.0049C50.0407 48.0049 50.4702 48.0874 50.8384 48.2524C51.2065 48.4175 51.5112 48.6502 51.7524 48.9507C51.9979 49.2469 52.1799 49.6003 52.2983 50.0107C52.4211 50.4212 52.4824 50.874 52.4824 51.3691V52.0229H47.1758V50.9248H50.9717V50.8042C50.9632 50.5291 50.9082 50.271 50.8066 50.0298C50.7093 49.7886 50.5591 49.5939 50.356 49.4458C50.1528 49.2977 49.882 49.2236 49.5435 49.2236C49.2896 49.2236 49.0632 49.2786 48.8643 49.3887C48.6696 49.4945 48.5067 49.6489 48.3755 49.8521C48.2443 50.0552 48.1427 50.3006 48.0708 50.5884C48.0031 50.8719 47.9692 51.1914 47.9692 51.5469V51.8008C47.9692 52.1012 48.0094 52.3805 48.0898 52.6387C48.1745 52.8926 48.2972 53.1147 48.458 53.3052C48.6188 53.4956 48.8135 53.6458 49.042 53.7559C49.2705 53.8617 49.5308 53.9146 49.8228 53.9146C50.1909 53.9146 50.5189 53.8405 50.8066 53.6924C51.0944 53.5443 51.3441 53.3348 51.5557 53.064L52.3618 53.8447C52.2137 54.0605 52.0212 54.2679 51.7842 54.4668C51.5472 54.6615 51.2573 54.8201 50.9146 54.9429C50.576 55.0656 50.1825 55.127 49.7339 55.127ZM55.4619 49.4395V55H53.9321V48.1318H55.3921L55.4619 49.4395ZM57.563 48.0874L57.5503 49.5093C57.4572 49.4924 57.3556 49.4797 57.2456 49.4712C57.1398 49.4627 57.034 49.4585 56.9282 49.4585C56.6659 49.4585 56.4352 49.4966 56.2363 49.5728C56.0374 49.6447 55.8703 49.7505 55.7349 49.8901C55.6037 50.0256 55.5021 50.1906 55.4302 50.3853C55.3582 50.5799 55.3159 50.7979 55.3032 51.0391L54.9541 51.0645C54.9541 50.6328 54.9964 50.2329 55.0811 49.8647C55.1657 49.4966 55.2926 49.1729 55.4619 48.8936C55.6354 48.6143 55.8512 48.3963 56.1094 48.2397C56.3717 48.0832 56.6743 48.0049 57.0171 48.0049C57.1102 48.0049 57.2096 48.0133 57.3154 48.0303C57.4255 48.0472 57.508 48.0662 57.563 48.0874ZM62.415 53.6226V50.3472C62.415 50.1017 62.3706 49.8901 62.2817 49.7124C62.1929 49.5347 62.0575 49.3971 61.8755 49.2998C61.6978 49.2025 61.4735 49.1538 61.2026 49.1538C60.953 49.1538 60.7371 49.1961 60.5552 49.2808C60.3732 49.3654 60.2314 49.4797 60.1299 49.6235C60.0283 49.7674 59.9775 49.9303 59.9775 50.1123H58.4541C58.4541 49.8415 58.5197 49.5791 58.6509 49.3252C58.7821 49.0713 58.9725 48.8449 59.2222 48.646C59.4718 48.4471 59.7702 48.2905 60.1172 48.1763C60.4642 48.062 60.8535 48.0049 61.2852 48.0049C61.8014 48.0049 62.2585 48.0916 62.6562 48.2651C63.0583 48.4386 63.3735 48.701 63.6021 49.0522C63.8348 49.3993 63.9512 49.8351 63.9512 50.3599V53.4131C63.9512 53.7262 63.9723 54.0076 64.0146 54.2573C64.0612 54.5028 64.1268 54.7165 64.2114 54.8984V55H62.6436C62.5716 54.835 62.5145 54.6255 62.4722 54.3716C62.4341 54.1134 62.415 53.8638 62.415 53.6226ZM62.6372 50.8232L62.6499 51.769H61.5518C61.2682 51.769 61.0186 51.7965 60.8027 51.8516C60.5869 51.9023 60.4071 51.9785 60.2632 52.0801C60.1193 52.1816 60.0114 52.3044 59.9395 52.4482C59.8675 52.5921 59.8315 52.755 59.8315 52.937C59.8315 53.119 59.8739 53.2861 59.9585 53.4385C60.0431 53.5866 60.1659 53.703 60.3267 53.7876C60.4917 53.8722 60.6906 53.9146 60.9233 53.9146C61.2365 53.9146 61.5094 53.8511 61.7422 53.7241C61.9792 53.5929 62.1654 53.4342 62.3008 53.248C62.4362 53.0576 62.5081 52.8778 62.5166 52.7085L63.0117 53.3877C62.9609 53.5612 62.8742 53.7474 62.7515 53.9463C62.6287 54.1452 62.4679 54.3356 62.269 54.5176C62.0744 54.6953 61.8395 54.8413 61.5645 54.9556C61.2936 55.0698 60.9805 55.127 60.625 55.127C60.1764 55.127 59.7765 55.0381 59.4253 54.8604C59.0741 54.6784 58.799 54.4351 58.6001 54.1304C58.4012 53.8215 58.3018 53.4723 58.3018 53.083C58.3018 52.7191 58.3695 52.3975 58.5049 52.1182C58.6445 51.8346 58.8477 51.5977 59.1143 51.4072C59.3851 51.2168 59.7152 51.0729 60.1045 50.9756C60.4938 50.874 60.9382 50.8232 61.4375 50.8232H62.6372ZM68.9492 48.1318V49.249H65.0771V48.1318H68.9492ZM66.1943 46.4497H67.7241V53.1021C67.7241 53.3136 67.7537 53.4766 67.813 53.5908C67.8765 53.7008 67.9632 53.7749 68.0732 53.813C68.1833 53.8511 68.3123 53.8701 68.4604 53.8701C68.5662 53.8701 68.6678 53.8638 68.7651 53.8511C68.8625 53.8384 68.9408 53.8257 69 53.813L69.0063 54.981C68.8794 55.019 68.7313 55.0529 68.562 55.0825C68.397 55.1121 68.2065 55.127 67.9907 55.127C67.6395 55.127 67.3285 55.0656 67.0576 54.9429C66.7868 54.8159 66.5752 54.6107 66.4229 54.3271C66.2705 54.0436 66.1943 53.667 66.1943 53.1973V46.4497ZM74.5122 53.3813V48.1318H76.0483V55H74.6011L74.5122 53.3813ZM74.728 51.9531L75.2422 51.9404C75.2422 52.4017 75.1914 52.827 75.0898 53.2163C74.9883 53.6014 74.8317 53.9378 74.6201 54.2256C74.4085 54.5091 74.1377 54.7313 73.8076 54.8921C73.4775 55.0487 73.0819 55.127 72.6206 55.127C72.2863 55.127 71.9795 55.0783 71.7002 54.981C71.4209 54.8836 71.1797 54.7334 70.9766 54.5303C70.7777 54.3271 70.6232 54.0627 70.5132 53.7368C70.4032 53.411 70.3481 53.0216 70.3481 52.5688V48.1318H71.8779V52.5815C71.8779 52.8312 71.9076 53.0407 71.9668 53.21C72.026 53.375 72.1064 53.5083 72.208 53.6099C72.3096 53.7114 72.4281 53.7834 72.5635 53.8257C72.6989 53.868 72.8428 53.8892 72.9951 53.8892C73.431 53.8892 73.7738 53.8045 74.0234 53.6353C74.2773 53.4618 74.4572 53.229 74.563 52.937C74.673 52.645 74.728 52.3171 74.728 51.9531ZM79.4023 49.4395V55H77.8726V48.1318H79.3325L79.4023 49.4395ZM81.5034 48.0874L81.4907 49.5093C81.3976 49.4924 81.2961 49.4797 81.186 49.4712C81.0802 49.4627 80.9744 49.4585 80.8687 49.4585C80.6063 49.4585 80.3757 49.4966 80.1768 49.5728C79.9779 49.6447 79.8107 49.7505 79.6753 49.8901C79.5441 50.0256 79.4425 50.1906 79.3706 50.3853C79.2987 50.5799 79.2563 50.7979 79.2437 51.0391L78.8945 51.0645C78.8945 50.6328 78.9368 50.2329 79.0215 49.8647C79.1061 49.4966 79.2331 49.1729 79.4023 48.8936C79.5758 48.6143 79.7917 48.3963 80.0498 48.2397C80.3122 48.0832 80.6147 48.0049 80.9575 48.0049C81.0506 48.0049 81.1501 48.0133 81.2559 48.0303C81.3659 48.0472 81.4484 48.0662 81.5034 48.0874ZM85.6128 55.127C85.105 55.127 84.6458 55.0444 84.2354 54.8794C83.8291 54.7101 83.4821 54.4753 83.1943 54.1748C82.9108 53.8743 82.6929 53.521 82.5405 53.1147C82.3882 52.7085 82.312 52.2705 82.312 51.8008V51.5469C82.312 51.0094 82.3903 50.5228 82.5469 50.0869C82.7035 49.651 82.9214 49.2786 83.2007 48.9697C83.48 48.6566 83.8101 48.4175 84.1909 48.2524C84.5718 48.0874 84.9844 48.0049 85.4287 48.0049C85.9196 48.0049 86.3491 48.0874 86.7173 48.2524C87.0854 48.4175 87.3901 48.6502 87.6313 48.9507C87.8768 49.2469 88.0588 49.6003 88.1772 50.0107C88.3 50.4212 88.3613 50.874 88.3613 51.3691V52.0229H83.0547V50.9248H86.8506V50.8042C86.8421 50.5291 86.7871 50.271 86.6855 50.0298C86.5882 49.7886 86.438 49.5939 86.2349 49.4458C86.0317 49.2977 85.7609 49.2236 85.4224 49.2236C85.1685 49.2236 84.9421 49.2786 84.7432 49.3887C84.5485 49.4945 84.3856 49.6489 84.2544 49.8521C84.1232 50.0552 84.0216 50.3006 83.9497 50.5884C83.882 50.8719 83.8481 51.1914 83.8481 51.5469V51.8008C83.8481 52.1012 83.8883 52.3805 83.9688 52.6387C84.0534 52.8926 84.1761 53.1147 84.3369 53.3052C84.4977 53.4956 84.6924 53.6458 84.9209 53.7559C85.1494 53.8617 85.4097 53.9146 85.7017 53.9146C86.0698 53.9146 86.3978 53.8405 86.6855 53.6924C86.9733 53.5443 87.223 53.3348 87.4346 53.064L88.2407 53.8447C88.0926 54.0605 87.9001 54.2679 87.6631 54.4668C87.4261 54.6615 87.1362 54.8201 86.7935 54.9429C86.4549 55.0656 86.0614 55.127 85.6128 55.127Z" fill="black" fill-opacity="0.87"/>
<path d="M23.1636 108.026V110H13.1308V108.304L18.0033 102.989C18.5378 102.386 18.9593 101.865 19.2677 101.427C19.5761 100.988 19.7919 100.594 19.9153 100.245C20.0455 99.8883 20.1106 99.5422 20.1106 99.2064C20.1106 98.7336 20.0215 98.3189 19.8433 97.9626C19.672 97.5994 19.4184 97.315 19.0826 97.1094C18.7468 96.8969 18.3391 96.7907 17.8594 96.7907C17.3043 96.7907 16.8383 96.9106 16.4613 97.1505C16.0844 97.3904 15.8 97.7227 15.6081 98.1476C15.4163 98.5657 15.3203 99.0454 15.3203 99.5868H12.8429C12.8429 98.7164 13.0417 97.9215 13.4391 97.2019C13.8366 96.4755 14.4123 95.8998 15.1661 95.4749C15.92 95.0432 16.828 94.8273 17.8902 94.8273C18.8908 94.8273 19.7405 94.9952 20.4396 95.331C21.1386 95.6668 21.6697 96.1431 22.0329 96.7599C22.403 97.3767 22.588 98.1065 22.588 98.9494C22.588 99.4154 22.5126 99.878 22.3618 100.337C22.2111 100.796 21.9952 101.255 21.7142 101.715C21.4401 102.167 21.1146 102.623 20.7377 103.082C20.3607 103.534 19.9461 103.993 19.4938 104.459L16.2558 108.026H23.1636ZM35.1291 108.026V110H25.0962V108.304L29.9687 102.989C30.5033 102.386 30.9247 101.865 31.2331 101.427C31.5415 100.988 31.7574 100.594 31.8807 100.245C32.011 99.8883 32.0761 99.5422 32.0761 99.2064C32.0761 98.7336 31.987 98.3189 31.8088 97.9626C31.6375 97.5994 31.3839 97.315 31.0481 97.1094C30.7123 96.8969 30.3045 96.7907 29.8248 96.7907C29.2697 96.7907 28.8037 96.9106 28.4268 97.1505C28.0499 97.3904 27.7655 97.7227 27.5736 98.1476C27.3817 98.5657 27.2858 99.0454 27.2858 99.5868H24.8084C24.8084 98.7164 25.0071 97.9215 25.4046 97.2019C25.8021 96.4755 26.3777 95.8998 27.1316 95.4749C27.8854 95.0432 28.7934 94.8273 29.8557 94.8273C30.8562 94.8273 31.706 94.9952 32.405 95.331C33.104 95.6668 33.6351 96.1431 33.9983 96.7599C34.3684 97.3767 34.5534 98.1065 34.5534 98.9494C34.5534 99.4154 34.4781 99.878 34.3273 100.337C34.1765 100.796 33.9606 101.255 33.6797 101.715C33.4056 102.167 33.08 102.623 32.7031 103.082C32.3262 103.534 31.9116 103.993 31.4593 104.459L28.2212 108.026H35.1291Z" fill="black" fill-opacity="0.87"/>
<path d="M41.3261 97.572C41.3261 97.0717 41.4494 96.6125 41.6961 96.1945C41.9428 95.7765 42.2718 95.4441 42.683 95.1974C43.101 94.9438 43.5533 94.817 44.0399 94.817C44.5333 94.817 44.9822 94.9438 45.3865 95.1974C45.7908 95.4441 46.1129 95.7765 46.3528 96.1945C46.5995 96.6125 46.7229 97.0717 46.7229 97.572C46.7229 98.0722 46.5995 98.5314 46.3528 98.9494C46.1129 99.3606 45.7908 99.6861 45.3865 99.926C44.9822 100.166 44.5333 100.286 44.0399 100.286C43.5533 100.286 43.101 100.166 42.683 99.926C42.2718 99.6861 41.9428 99.3606 41.6961 98.9494C41.4494 98.5314 41.3261 98.0722 41.3261 97.572ZM42.7138 97.572C42.7138 97.942 42.844 98.2538 43.1044 98.5074C43.3649 98.7541 43.6767 98.8775 44.0399 98.8775C44.4031 98.8775 44.7081 98.7541 44.9548 98.5074C45.2015 98.2607 45.3248 97.9489 45.3248 97.572C45.3248 97.1882 45.2015 96.8695 44.9548 96.616C44.7081 96.3624 44.4031 96.2356 44.0399 96.2356C43.6767 96.2356 43.3649 96.3624 43.1044 96.616C42.844 96.8695 42.7138 97.1882 42.7138 97.572ZM58.421 105.127H60.9909C60.9087 106.107 60.6346 106.981 60.1686 107.749C59.7026 108.509 59.0481 109.109 58.2052 109.548C57.3622 109.986 56.3377 110.206 55.1316 110.206C54.2064 110.206 53.3738 110.041 52.6336 109.712C51.8935 109.376 51.2596 108.904 50.7319 108.294C50.2042 107.677 49.7999 106.933 49.5189 106.063C49.2448 105.193 49.1077 104.219 49.1077 103.144V101.9C49.1077 100.824 49.2482 99.8506 49.5292 98.9803C49.817 98.1099 50.2282 97.3664 50.7627 96.7496C51.2973 96.126 51.938 95.6497 52.685 95.3207C53.4389 94.9918 54.2852 94.8273 55.2241 94.8273C56.4165 94.8273 57.4239 95.0466 58.2463 95.4852C59.0687 95.9238 59.706 96.5303 60.1583 97.3047C60.6174 98.0791 60.8984 98.9666 61.0012 99.9671H58.4313C58.3628 99.3229 58.212 98.7713 57.979 98.3121C57.7529 97.8529 57.4171 97.5034 56.9716 97.2636C56.5262 97.0169 55.9437 96.8935 55.2241 96.8935C54.6347 96.8935 54.1207 97.0032 53.6821 97.2225C53.2435 97.4418 52.8769 97.7639 52.5822 98.1887C52.2875 98.6136 52.0648 99.1379 51.9141 99.7615C51.7701 100.378 51.6982 101.084 51.6982 101.879V103.144C51.6982 103.897 51.7633 104.583 51.8935 105.199C52.0306 105.809 52.2361 106.334 52.5103 106.772C52.7912 107.211 53.1476 107.55 53.5793 107.79C54.0111 108.03 54.5285 108.15 55.1316 108.15C55.8648 108.15 56.4576 108.033 56.9099 107.8C57.3691 107.567 57.7152 107.228 57.9482 106.782C58.188 106.33 58.3457 105.779 58.421 105.127Z" fill="black" fill-opacity="0.87"/>
<path d="M68.782 111.148L79.0732 104.876C80.7647 103.845 82.07 102.286 82.7875 100.44L85.8908 92.4545C88.2495 86.3849 96.8379 86.3849 99.1967 92.4545V92.4545C101.273 97.7979 108.483 98.6368 111.731 93.913L115.403 88.5725C117.667 85.2792 122.328 84.765 125.256 87.4856V87.4856C128.533 90.5304 133.83 89.4665 135.677 85.3927L138.501 79.1631C141.612 72.3021 151.264 72.0491 154.73 78.7379L160.17 89.237C162.261 93.2728 167.028 95.1229 171.294 93.5546L174.612 92.3348C176.838 91.5166 179.297 91.6075 181.456 92.5881L189.627 96.2988" stroke="#3F52DD" stroke-width="1.50376" stroke-linecap="round"/>
</svg>
", "description": "Displays a single entity historical telemetry values as a simplified chart. Optionally may display the corresponding latest telemetry value.", "descriptor": { "type": "timeseries", @@ -22,6 +22,5 @@ "basicModeDirective": "tb-value-chart-card-basic-config", "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"rgb(63, 82, 221)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"latestDataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Latest\",\"color\":\"rgb(63, 82, 221)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":null,\"padding\":\"0\",\"settings\":{\"layout\":\"left\",\"autoScale\":true,\"showValue\":true,\"valueFont\":{\"family\":\"Roboto\",\"size\":28,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"32px\"},\"valueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Simple Value and chart card\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"iconSize\":\"18px\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"useDashboardTimewindow\":true,\"decimals\":0,\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"borderRadius\":null,\"units\":\"°C\",\"displayTimewindow\":true,\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":43200000,\"fixedTimewindow\":{\"startTimeMs\":1697382151041,\"endTimeMs\":1697468551041},\"quickInterval\":\"CURRENT_MONTH_SO_FAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000}},\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true}}" }, - "externalId": null, "tags": null } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/single_switch.json b/application/src/main/data/json/system/widget_types/single_switch.json index b14cf633a2..8faea8ba93 100644 --- a/application/src/main/data/json/system/widget_types/single_switch.json +++ b/application/src/main/data/json/system/widget_types/single_switch.json @@ -3,7 +3,7 @@ "name": "Single Switch", "deprecated": false, "image": "tb-image:c2luZ2xlLXN3aXRjaC5zdmc=:IlNpbmdsZSBTd2l0Y2giIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="200" height="160" rx="4" fill="white"/>
<rect x="31.5771" y="65.0742" width="56.9901" height="29.852" rx="14.926" fill="#5469FF"/>
<circle cx="73.6409" cy="80.0003" r="12.2122" fill="white"/>
<path d="M109.241 83.4717C109.241 83.1494 109.191 82.863 109.091 82.6123C108.998 82.3617 108.829 82.1325 108.586 81.9248C108.342 81.7171 107.999 81.5166 107.555 81.3232C107.118 81.1227 106.559 80.9186 105.879 80.7109C105.134 80.4818 104.447 80.2275 103.816 79.9482C103.193 79.6618 102.649 79.3324 102.184 78.96C101.718 78.5804 101.356 78.1471 101.099 77.6602C100.841 77.166 100.712 76.5967 100.712 75.9521C100.712 75.3148 100.844 74.7347 101.109 74.2119C101.382 73.6891 101.765 73.238 102.259 72.8584C102.76 72.4717 103.351 72.1745 104.031 71.9668C104.712 71.752 105.464 71.6445 106.287 71.6445C107.447 71.6445 108.446 71.8594 109.284 72.2891C110.129 72.7188 110.777 73.2952 111.229 74.0186C111.687 74.7419 111.916 75.5404 111.916 76.4141H109.241C109.241 75.8984 109.13 75.4437 108.908 75.0498C108.693 74.6488 108.364 74.3337 107.92 74.1045C107.483 73.8753 106.928 73.7607 106.255 73.7607C105.618 73.7607 105.088 73.8574 104.665 74.0508C104.243 74.2441 103.927 74.5055 103.72 74.835C103.512 75.1644 103.408 75.5368 103.408 75.9521C103.408 76.2458 103.476 76.5143 103.612 76.7578C103.748 76.9941 103.956 77.2161 104.235 77.4238C104.515 77.6243 104.866 77.8141 105.288 77.9932C105.711 78.1722 106.208 78.3441 106.781 78.5088C107.648 78.7666 108.403 79.0531 109.048 79.3682C109.692 79.6761 110.229 80.027 110.659 80.4209C111.089 80.8148 111.411 81.2624 111.626 81.7637C111.841 82.2578 111.948 82.82 111.948 83.4502C111.948 84.109 111.816 84.7035 111.551 85.2334C111.286 85.7562 110.906 86.2038 110.412 86.5762C109.925 86.9414 109.338 87.2243 108.65 87.4248C107.97 87.6182 107.211 87.7148 106.373 87.7148C105.621 87.7148 104.88 87.6146 104.149 87.4141C103.426 87.2135 102.767 86.9092 102.173 86.501C101.578 86.0856 101.106 85.57 100.755 84.9541C100.404 84.3311 100.229 83.6042 100.229 82.7734H102.925C102.925 83.2819 103.011 83.7152 103.183 84.0732C103.362 84.4313 103.609 84.7249 103.924 84.9541C104.239 85.1761 104.604 85.3408 105.02 85.4482C105.442 85.5557 105.893 85.6094 106.373 85.6094C107.003 85.6094 107.53 85.5199 107.952 85.3408C108.382 85.1618 108.704 84.9111 108.919 84.5889C109.134 84.2666 109.241 83.8942 109.241 83.4717ZM117.577 84.9219L120.263 75.877H121.917L121.466 78.584L118.759 87.5H117.276L117.577 84.9219ZM115.998 75.877L118.093 84.9648L118.265 87.5H116.61L113.463 75.877H115.998ZM124.431 84.8574L126.461 75.877H128.985L125.849 87.5H124.194L124.431 84.8574ZM122.196 75.877L124.85 84.8145L125.183 87.5H123.7L120.961 78.5732L120.51 75.877H122.196ZM133.862 75.877V87.5H131.263V75.877H133.862ZM131.091 72.8262C131.091 72.4323 131.22 72.1064 131.478 71.8486C131.743 71.5837 132.108 71.4512 132.573 71.4512C133.032 71.4512 133.393 71.5837 133.658 71.8486C133.923 72.1064 134.056 72.4323 134.056 72.8262C134.056 73.2129 133.923 73.5352 133.658 73.793C133.393 74.0508 133.032 74.1797 132.573 74.1797C132.108 74.1797 131.743 74.0508 131.478 73.793C131.22 73.5352 131.091 73.2129 131.091 72.8262ZM142.37 75.877V77.7676H135.817V75.877H142.37ZM137.708 73.0303H140.297V84.2881C140.297 84.6462 140.347 84.9219 140.447 85.1152C140.555 85.3014 140.701 85.4268 140.888 85.4912C141.074 85.5557 141.292 85.5879 141.543 85.5879C141.722 85.5879 141.894 85.5771 142.059 85.5557C142.223 85.5342 142.356 85.5127 142.456 85.4912L142.467 87.4678C142.252 87.5322 142.001 87.5895 141.715 87.6396C141.436 87.6898 141.113 87.7148 140.748 87.7148C140.154 87.7148 139.627 87.611 139.169 87.4033C138.711 87.1885 138.353 86.8411 138.095 86.3613C137.837 85.8815 137.708 85.2441 137.708 84.4492V73.0303ZM149.46 85.6523C149.882 85.6523 150.262 85.57 150.599 85.4053C150.942 85.2334 151.218 84.9971 151.426 84.6963C151.641 84.3955 151.759 84.0482 151.78 83.6543H154.219C154.204 84.4062 153.982 85.0902 153.553 85.7061C153.123 86.3219 152.554 86.8125 151.845 87.1777C151.136 87.5358 150.352 87.7148 149.492 87.7148C148.604 87.7148 147.831 87.5645 147.172 87.2637C146.513 86.9557 145.965 86.5332 145.528 85.9961C145.091 85.459 144.762 84.8395 144.54 84.1377C144.325 83.4359 144.218 82.6839 144.218 81.8818V81.5059C144.218 80.7038 144.325 79.9518 144.54 79.25C144.762 78.541 145.091 77.918 145.528 77.3809C145.965 76.8438 146.513 76.4248 147.172 76.124C147.831 75.8161 148.601 75.6621 149.481 75.6621C150.412 75.6621 151.229 75.8483 151.931 76.2207C152.632 76.5859 153.184 77.098 153.585 77.7568C153.993 78.4085 154.204 79.1676 154.219 80.0342H151.78C151.759 79.6045 151.651 79.2178 151.458 78.874C151.272 78.5231 151.007 78.2438 150.663 78.0361C150.326 77.8285 149.922 77.7246 149.449 77.7246C148.926 77.7246 148.493 77.832 148.149 78.0469C147.806 78.2546 147.537 78.541 147.344 78.9062C147.15 79.2643 147.011 79.6689 146.925 80.1201C146.846 80.5641 146.807 81.026 146.807 81.5059V81.8818C146.807 82.3617 146.846 82.8271 146.925 83.2783C147.004 83.7295 147.14 84.1341 147.333 84.4922C147.534 84.8431 147.806 85.126 148.149 85.3408C148.493 85.5485 148.93 85.6523 149.46 85.6523ZM159.106 71V87.5H156.528V71H159.106ZM158.655 81.2588L157.817 81.248C157.825 80.446 157.936 79.7048 158.15 79.0244C158.372 78.3441 158.68 77.7533 159.074 77.252C159.475 76.7435 159.955 76.3532 160.514 76.0811C161.072 75.8018 161.692 75.6621 162.372 75.6621C162.945 75.6621 163.461 75.7409 163.919 75.8984C164.384 76.056 164.785 76.3102 165.122 76.6611C165.459 77.0049 165.713 77.4561 165.885 78.0146C166.064 78.5661 166.153 79.2393 166.153 80.0342V87.5H163.554V80.0127C163.554 79.4541 163.471 79.0101 163.307 78.6807C163.149 78.3512 162.916 78.1149 162.608 77.9717C162.3 77.8213 161.924 77.7461 161.48 77.7461C161.015 77.7461 160.603 77.8392 160.245 78.0254C159.894 78.2116 159.601 78.4658 159.364 78.7881C159.128 79.1104 158.949 79.4827 158.827 79.9053C158.713 80.3278 158.655 80.779 158.655 81.2588Z" fill="black" fill-opacity="0.76"/>
</svg>
", - "description": "Sends the command to the device or updates attribute/time-series when the user toggles the slider. Widget settings will enable you to configure behavior how to fetch the initial state and what to trigger when turn on/off states.", + "description": "Allows users to toggle a slider to send commands to devices or update attributes/time-series data. Configurable settings let users define how to retrieve the initial state and specify actions for the on/off toggle.", "descriptor": { "type": "rpc", "sizeX": 3.5, @@ -30,6 +30,9 @@ "interface", "subroutine call", "inter-process communication", - "server request" + "server request", + "update attribute", + "set attribute", + "add time-series" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/slider.json b/application/src/main/data/json/system/widget_types/slider.json new file mode 100644 index 0000000000..8cbf5326c3 --- /dev/null +++ b/application/src/main/data/json/system/widget_types/slider.json @@ -0,0 +1,39 @@ +{ + "fqn": "slider", + "name": "Slider", + "deprecated": false, + "image": "tb-image:SG9yaXpvbnRhbCBzbGlkZXIuc3Zn:IlNsaWRlciIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M90.5064 60.918V63.168H78.2017L78.108 61.4688L85.4673 49.9375H87.7291L85.2798 54.1328L81.0494 60.918H90.5064ZM88.3736 49.9375V67H85.5494V49.9375H88.3736ZM103.609 62.3477C103.609 63.4102 103.363 64.3047 102.871 65.0312C102.379 65.7578 101.707 66.3086 100.855 66.6836C100.012 67.0508 99.0586 67.2344 97.9961 67.2344C96.9336 67.2344 95.9766 67.0508 95.125 66.6836C94.2734 66.3086 93.6016 65.7578 93.1094 65.0312C92.6172 64.3047 92.3711 63.4102 92.3711 62.3477C92.3711 61.6445 92.5078 61.0078 92.7813 60.4375C93.0547 59.8594 93.4414 59.3633 93.9414 58.9492C94.4492 58.5273 95.043 58.2031 95.7227 57.9766C96.4102 57.75 97.1602 57.6367 97.9727 57.6367C99.0508 57.6367 100.016 57.8359 100.867 58.2344C101.719 58.6328 102.387 59.1836 102.871 59.8867C103.363 60.5898 103.609 61.4102 103.609 62.3477ZM100.773 62.207C100.773 61.6367 100.656 61.1367 100.422 60.707C100.188 60.2773 99.8594 59.9453 99.4375 59.7109C99.0156 59.4766 98.5273 59.3594 97.9727 59.3594C97.4102 59.3594 96.9219 59.4766 96.5078 59.7109C96.0938 59.9453 95.7695 60.2773 95.5352 60.707C95.3086 61.1367 95.1953 61.6367 95.1953 62.207C95.1953 62.7852 95.3086 63.2852 95.5352 63.707C95.7617 64.1211 96.0859 64.4375 96.5078 64.6562C96.9297 64.875 97.4258 64.9844 97.9961 64.9844C98.5664 64.9844 99.0586 64.875 99.4727 64.6562C99.8867 64.4375 100.207 64.1211 100.434 63.707C100.66 63.2852 100.773 62.7852 100.773 62.207ZM103.223 54.4258C103.223 55.2773 102.996 56.0352 102.543 56.6992C102.098 57.3633 101.48 57.8867 100.691 58.2695C99.9023 58.6445 99.0039 58.832 97.9961 58.832C96.9805 58.832 96.0742 58.6445 95.2773 58.2695C94.4883 57.8867 93.8672 57.3633 93.4141 56.6992C92.9688 56.0352 92.7461 55.2773 92.7461 54.4258C92.7461 53.4102 92.9688 52.5547 93.4141 51.8594C93.8672 51.1562 94.4883 50.6211 95.2773 50.2539C96.0664 49.8867 96.9688 49.7031 97.9844 49.7031C99 49.7031 99.9023 49.8867 100.691 50.2539C101.48 50.6211 102.098 51.1562 102.543 51.8594C102.996 52.5547 103.223 53.4102 103.223 54.4258ZM100.398 54.5195C100.398 54.0117 100.297 53.5664 100.094 53.1836C99.8984 52.793 99.6211 52.4883 99.2617 52.2695C98.9023 52.0508 98.4766 51.9414 97.9844 51.9414C97.4922 51.9414 97.0664 52.0469 96.707 52.2578C96.3477 52.4688 96.0703 52.7656 95.875 53.1484C95.6797 53.5312 95.582 53.9883 95.582 54.5195C95.582 55.043 95.6797 55.5 95.875 55.8906C96.0703 56.2734 96.3477 56.5742 96.707 56.793C97.0742 57.0117 97.5039 57.1211 97.9961 57.1211C98.4883 57.1211 98.9141 57.0117 99.2734 56.793C99.6328 56.5742 99.9102 56.2734 100.105 55.8906C100.301 55.5 100.398 55.043 100.398 54.5195ZM106.037 54.1211V53.2188C106.037 52.5703 106.177 51.9805 106.458 51.4492C106.74 50.918 107.15 50.4922 107.689 50.1719C108.228 49.8516 108.876 49.6914 109.634 49.6914C110.415 49.6914 111.072 49.8516 111.603 50.1719C112.142 50.4922 112.552 50.918 112.833 51.4492C113.115 51.9805 113.255 52.5703 113.255 53.2188V54.1211C113.255 54.7539 113.115 55.3359 112.833 55.8672C112.56 56.3984 112.154 56.8242 111.615 57.1445C111.083 57.4648 110.431 57.625 109.658 57.625C108.892 57.625 108.236 57.4648 107.689 57.1445C107.15 56.8242 106.74 56.3984 106.458 55.8672C106.177 55.3359 106.037 54.7539 106.037 54.1211ZM107.994 53.2188V54.1211C107.994 54.4336 108.052 54.7305 108.169 55.0117C108.294 55.293 108.482 55.5195 108.732 55.6914C108.982 55.8633 109.29 55.9492 109.658 55.9492C110.033 55.9492 110.337 55.8633 110.572 55.6914C110.814 55.5195 110.994 55.293 111.111 55.0117C111.228 54.7305 111.287 54.4336 111.287 54.1211V53.2188C111.287 52.8984 111.224 52.5977 111.099 52.3164C110.982 52.0273 110.802 51.7969 110.56 51.625C110.318 51.4531 110.009 51.3672 109.634 51.3672C109.275 51.3672 108.97 51.4531 108.72 51.625C108.478 51.7969 108.294 52.0273 108.169 52.3164C108.052 52.5977 107.994 52.8984 107.994 53.2188ZM114.263 63.7305V62.8164C114.263 62.1758 114.404 61.5898 114.685 61.0586C114.974 60.5273 115.388 60.1016 115.927 59.7812C116.466 59.4609 117.115 59.3008 117.873 59.3008C118.654 59.3008 119.31 59.4609 119.841 59.7812C120.38 60.1016 120.787 60.5273 121.06 61.0586C121.341 61.5898 121.482 62.1758 121.482 62.8164V63.7305C121.482 64.3711 121.341 64.957 121.06 65.4883C120.787 66.0195 120.384 66.4453 119.853 66.7656C119.322 67.0859 118.673 67.2461 117.908 67.2461C117.134 67.2461 116.474 67.0859 115.927 66.7656C115.388 66.4453 114.974 66.0195 114.685 65.4883C114.404 64.957 114.263 64.3711 114.263 63.7305ZM116.232 62.8164V63.7305C116.232 64.043 116.294 64.3398 116.419 64.6211C116.552 64.9023 116.744 65.1328 116.994 65.3125C117.244 65.4844 117.544 65.5703 117.896 65.5703C118.294 65.5703 118.615 65.4844 118.857 65.3125C119.099 65.1328 119.271 64.9062 119.373 64.6328C119.482 64.3516 119.537 64.0508 119.537 63.7305V62.8164C119.537 62.4961 119.474 62.1953 119.349 61.9141C119.232 61.6328 119.048 61.4062 118.798 61.2344C118.556 61.0625 118.248 60.9766 117.873 60.9766C117.505 60.9766 117.201 61.0625 116.958 61.2344C116.716 61.4062 116.533 61.6328 116.408 61.9141C116.29 62.1953 116.232 62.4961 116.232 62.8164ZM118.576 52.375L110.244 65.7109L108.802 64.8789L117.134 51.543L118.576 52.375Z" fill="black" fill-opacity="0.87"/>
<rect y="79" width="200" height="8" rx="2.70174" fill="#5469FF" fill-opacity="0.3"/>
<circle cx="2.91946" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="18.2525" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="33.5845" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="48.9165" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="64.2486" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="79.5806" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="94.9136" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="110.677" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="126.871" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="143.065" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="159.26" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="175.455" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="191.649" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<rect y="79" width="101" height="8" rx="2.70174" fill="#5469FF"/>
<path d="M5.55908 95.4668V96.6592C5.55908 97.3001 5.50179 97.8408 5.38721 98.2812C5.27262 98.7217 5.10791 99.0762 4.89307 99.3447C4.67822 99.6133 4.41862 99.8084 4.11426 99.9302C3.81348 100.048 3.47331 100.107 3.09375 100.107C2.79297 100.107 2.51546 100.07 2.26123 99.9946C2.007 99.9194 1.77783 99.7995 1.57373 99.6348C1.37321 99.4665 1.20133 99.248 1.05811 98.9795C0.914876 98.7109 0.805664 98.3851 0.730469 98.002C0.655273 97.6188 0.617676 97.1712 0.617676 96.6592V95.4668C0.617676 94.8258 0.674967 94.2887 0.789551 93.8555C0.907715 93.4222 1.07422 93.0749 1.28906 92.8135C1.50391 92.5485 1.76172 92.3587 2.0625 92.2441C2.36686 92.1296 2.70703 92.0723 3.08301 92.0723C3.38737 92.0723 3.66667 92.1099 3.9209 92.1851C4.17871 92.2567 4.40788 92.373 4.6084 92.5342C4.80892 92.6917 4.979 92.903 5.11865 93.168C5.26188 93.4294 5.37109 93.7498 5.44629 94.1294C5.52148 94.509 5.55908 94.9548 5.55908 95.4668ZM4.56006 96.8203V95.3003C4.56006 94.9494 4.53857 94.6414 4.49561 94.3765C4.45622 94.1079 4.39714 93.8787 4.31836 93.689C4.23958 93.4992 4.13932 93.3452 4.01758 93.2271C3.89941 93.1089 3.76156 93.0229 3.604 92.9692C3.45003 92.9119 3.27637 92.8833 3.08301 92.8833C2.84668 92.8833 2.63721 92.9281 2.45459 93.0176C2.27197 93.1035 2.118 93.2414 1.99268 93.4312C1.87093 93.6209 1.77783 93.8698 1.71338 94.1777C1.64893 94.4857 1.6167 94.8599 1.6167 95.3003V96.8203C1.6167 97.1712 1.63639 97.481 1.67578 97.7495C1.71875 98.0181 1.78141 98.2508 1.86377 98.4478C1.94613 98.6411 2.04639 98.8005 2.16455 98.9258C2.28271 99.0511 2.41878 99.1442 2.57275 99.2051C2.73031 99.2624 2.90397 99.291 3.09375 99.291C3.33724 99.291 3.55029 99.2445 3.73291 99.1514C3.91553 99.0583 4.06771 98.9132 4.18945 98.7163C4.31478 98.5158 4.40788 98.2598 4.46875 97.9482C4.52962 97.6331 4.56006 97.2572 4.56006 96.8203Z" fill="black" fill-opacity="0.54"/>
<path d="M184.853 92.1367V100H183.859V93.3774L181.856 94.1079V93.2109L184.697 92.1367H184.853ZM192.934 95.4668V96.6592C192.934 97.3001 192.877 97.8408 192.762 98.2812C192.648 98.7217 192.483 99.0762 192.268 99.3447C192.053 99.6133 191.794 99.8084 191.489 99.9302C191.188 100.048 190.848 100.107 190.469 100.107C190.168 100.107 189.89 100.07 189.636 99.9946C189.382 99.9194 189.153 99.7995 188.949 99.6348C188.748 99.4665 188.576 99.248 188.433 98.9795C188.29 98.7109 188.181 98.3851 188.105 98.002C188.03 97.6188 187.993 97.1712 187.993 96.6592V95.4668C187.993 94.8258 188.05 94.2887 188.165 93.8555C188.283 93.4222 188.449 93.0749 188.664 92.8135C188.879 92.5485 189.137 92.3587 189.438 92.2441C189.742 92.1296 190.082 92.0723 190.458 92.0723C190.762 92.0723 191.042 92.1099 191.296 92.1851C191.554 92.2567 191.783 92.373 191.983 92.5342C192.184 92.6917 192.354 92.903 192.494 93.168C192.637 93.4294 192.746 93.7498 192.821 94.1294C192.896 94.509 192.934 94.9548 192.934 95.4668ZM191.935 96.8203V95.3003C191.935 94.9494 191.914 94.6414 191.871 94.3765C191.831 94.1079 191.772 93.8787 191.693 93.689C191.615 93.4992 191.514 93.3452 191.393 93.2271C191.274 93.1089 191.137 93.0229 190.979 92.9692C190.825 92.9119 190.651 92.8833 190.458 92.8833C190.222 92.8833 190.012 92.9281 189.83 93.0176C189.647 93.1035 189.493 93.2414 189.368 93.4312C189.246 93.6209 189.153 93.8698 189.088 94.1777C189.024 94.4857 188.992 94.8599 188.992 95.3003V96.8203C188.992 97.1712 189.011 97.481 189.051 97.7495C189.094 98.0181 189.156 98.2508 189.239 98.4478C189.321 98.6411 189.421 98.8005 189.54 98.9258C189.658 99.0511 189.794 99.1442 189.948 99.2051C190.105 99.2624 190.279 99.291 190.469 99.291C190.712 99.291 190.925 99.2445 191.108 99.1514C191.291 99.0583 191.443 98.9132 191.564 98.7163C191.69 98.5158 191.783 98.2598 191.844 97.9482C191.905 97.6331 191.935 97.2572 191.935 96.8203ZM199.372 95.4668V96.6592C199.372 97.3001 199.314 97.8408 199.2 98.2812C199.085 98.7217 198.92 99.0762 198.706 99.3447C198.491 99.6133 198.231 99.8084 197.927 99.9302C197.626 100.048 197.286 100.107 196.906 100.107C196.605 100.107 196.328 100.07 196.074 99.9946C195.819 99.9194 195.59 99.7995 195.386 99.6348C195.186 99.4665 195.014 99.248 194.871 98.9795C194.727 98.7109 194.618 98.3851 194.543 98.002C194.468 97.6188 194.43 97.1712 194.43 96.6592V95.4668C194.43 94.8258 194.487 94.2887 194.602 93.8555C194.72 93.4222 194.887 93.0749 195.102 92.8135C195.316 92.5485 195.574 92.3587 195.875 92.2441C196.179 92.1296 196.52 92.0723 196.896 92.0723C197.2 92.0723 197.479 92.1099 197.733 92.1851C197.991 92.2567 198.22 92.373 198.421 92.5342C198.621 92.6917 198.792 92.903 198.931 93.168C199.074 93.4294 199.184 93.7498 199.259 94.1294C199.334 94.509 199.372 94.9548 199.372 95.4668ZM198.373 96.8203V95.3003C198.373 94.9494 198.351 94.6414 198.308 94.3765C198.269 94.1079 198.21 93.8787 198.131 93.689C198.052 93.4992 197.952 93.3452 197.83 93.2271C197.712 93.1089 197.574 93.0229 197.417 92.9692C197.263 92.9119 197.089 92.8833 196.896 92.8833C196.659 92.8833 196.45 92.9281 196.267 93.0176C196.084 93.1035 195.931 93.2414 195.805 93.4312C195.683 93.6209 195.59 93.8698 195.526 94.1777C195.461 94.4857 195.429 94.8599 195.429 95.3003V96.8203C195.429 97.1712 195.449 97.481 195.488 97.7495C195.531 98.0181 195.594 98.2508 195.676 98.4478C195.759 98.6411 195.859 98.8005 195.977 98.9258C196.095 99.0511 196.231 99.1442 196.385 99.2051C196.543 99.2624 196.716 99.291 196.906 99.291C197.15 99.291 197.363 99.2445 197.545 99.1514C197.728 99.0583 197.88 98.9132 198.002 98.7163C198.127 98.5158 198.22 98.2598 198.281 97.9482C198.342 97.6331 198.373 97.2572 198.373 96.8203Z" fill="black" fill-opacity="0.54"/>
<circle cx="100" cy="83" r="8" fill="#5469FF"/>
</svg>
", + "description": "Allows users to move thumb of a slider to send commands to devices or update attributes/time-series data. Configurable settings let users define how to retrieve the initial state and specify actions for the value change.", + "descriptor": { + "type": "rpc", + "sizeX": 5, + "sizeY": 3, + "resources": [], + "templateHtml": "\n", + "templateCss": "", + "controllerScript": "self.onInit = function() {\n self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '360px',\n previewHeight: '220px',\n embedTitlePanel: true,\n displayRpcMessageToast: false\n };\n};\n\nself.onDestroy = function() {\n}\n", + "settingsSchema": "", + "dataKeySettingsSchema": "{}\n", + "settingsDirective": "tb-slider-widget-settings", + "hasBasicMode": true, + "basicModeDirective": "tb-slider-basic-config", + "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Slider\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":null,\"weight\":\"500\",\"style\":null,\"lineHeight\":\"24px\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"14px\",\"configMode\":\"basic\",\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}" + }, + "tags": [ + "command", + "downlink", + "device configuration", + "device control", + "invocation", + "remote method", + "remote function", + "interface", + "subroutine call", + "inter-process communication", + "server request", + "update attribute", + "set attribute", + "add time-series", + "slider" + ] +} \ No newline at end of file diff --git a/application/src/main/data/json/tenant/dashboards/gateways.json b/application/src/main/data/json/tenant/dashboards/gateways.json index 0ddfc98705..4ccee86d5e 100644 --- a/application/src/main/data/json/tenant/dashboards/gateways.json +++ b/application/src/main/data/json/tenant/dashboards/gateways.json @@ -2317,7 +2317,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "45e4507d-3adc-bb31-8b2b-1ba09bbd56ac" @@ -2484,7 +2484,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "852eccce-98eb-24db-c783-bdd62566f906" @@ -2650,7 +2650,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "3c31ba62-e760-2bea-4c8d-d32784a86c24" @@ -2816,7 +2816,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "4b55ea81-93bf-4206-9166-3e0bdc1dd9f3" @@ -2982,7 +2982,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "babf88d0-a118-e2b5-f10e-3a5970c8a65b" @@ -3148,7 +3148,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "94de7690-f91d-b032-6771-85af99abd749" @@ -3314,7 +3314,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "18414f44-1c65-536a-14de-eaf21a7d56bd" @@ -3480,7 +3480,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "794974da-c9d2-a9f7-be47-c9eb642094e8" @@ -3646,7 +3646,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "2add705b-3e53-8559-8126-380cac686fb0" @@ -3812,7 +3812,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "7e1ba820-9992-d52a-579b-20485abb3926" @@ -3978,7 +3978,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "91af27c1-b37c-2276-6022-a332e41b2b33" @@ -4144,7 +4144,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "26cf8696-054b-13ec-7984-6fc5df20e6f1" @@ -4310,7 +4310,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "1dcfaf24-32be-cd19-62d6-86d12cc6a7ef" @@ -4476,7 +4476,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "ad2bc817-f3c4-150c-4672-8fe0c38aee8d" @@ -4642,7 +4642,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "d1ad84cd-bd9c-4dca-e4a0-f444ae8598bd" @@ -4808,7 +4808,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "bf80eef9-b879-9a08-40a4-488dbdefa125" @@ -4974,7 +4974,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "b5a406b3-cc0a-8a09-9aec-3f8befae5fb8" @@ -5140,7 +5140,7 @@ "useShowWidgetActionFunction": null, "showWidgetActionFunction": "return true;", "type": "custom", - "customFunction": "const url = `${window.location.origin}/entities/devices/${entityId.id}`;\nwindow.open(url, '_blank');", + "customFunction": "const url = `${window.location.origin + widgetContext.utils.getEntityDetailsPageURL(entityId.id, entityId.entityType)}`;\nwindow.open(url, '_blank');", "openInSeparateDialog": false, "openInPopover": false, "id": "ec1dfba3-4b43-2491-8948-f602337f8a3b" diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 31d9e477ac..e3ebbdf892 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -31,6 +31,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.rule.engine.api.MailService; import org.thingsboard.rule.engine.api.NotificationCenter; +import org.thingsboard.rule.engine.api.RuleEngineDeviceStateManager; import org.thingsboard.rule.engine.api.SmsService; import org.thingsboard.rule.engine.api.slack.SlackService; import org.thingsboard.rule.engine.api.sms.SmsSenderFactory; @@ -203,6 +204,10 @@ public class ActorSystemContext { @Getter private DeviceCredentialsService deviceCredentialsService; + @Autowired(required = false) + @Getter + private RuleEngineDeviceStateManager deviceStateManager; + @Autowired @Getter private TbTenantProfileCache tenantProfileCache; @@ -556,6 +561,10 @@ public class ActorSystemContext { @Getter private boolean externalNodeForceAck; + @Value("${state.rule.node.deviceState.rateLimit:1:1,30:60,60:3600}") + @Getter + private String deviceStateNodeRateLimitConfig; + @Getter @Setter private TbActorSystem actorSystem; diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index 58bd82abb3..f1c0260124 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -66,7 +66,6 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNoti import org.thingsboard.server.common.msg.rule.engine.DeviceEdgeUpdateMsg; import org.thingsboard.server.common.msg.rule.engine.DeviceNameOrTypeUpdateMsg; import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeoutMsg; -import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg; import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg; import org.thingsboard.server.gen.transport.TransportProtos.DeviceSessionsCacheEntry; @@ -90,7 +89,9 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg; import org.thingsboard.server.gen.transport.TransportProtos.ToTransportUpdateCredentialsProto; import org.thingsboard.server.gen.transport.TransportProtos.TransportToDeviceActorMsg; import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto; +import org.thingsboard.server.gen.transport.TransportProtos.UplinkNotificationMsg; import org.thingsboard.server.service.rpc.RpcSubmitStrategy; +import org.thingsboard.server.service.state.DefaultDeviceStateService; import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper; import javax.annotation.Nullable; @@ -173,7 +174,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso private EdgeId findRelatedEdgeId() { List result = - systemContext.getRelationService().findByToAndType(tenantId, deviceId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON); + systemContext.getRelationService().findByToAndType(tenantId, deviceId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE); if (result != null && result.size() > 0) { EntityRelation relationToEdge = result.get(0); if (relationToEdge.getFrom() != null && relationToEdge.getFrom().getId() != null) { @@ -212,8 +213,11 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso if (systemContext.isEdgesEnabled() && edgeId != null) { log.debug("[{}][{}] device is related to edge: [{}]. Saving RPC request: [{}][{}] to edge queue", tenantId, deviceId, edgeId.getId(), rpcId, requestId); try { - saveRpcRequestToEdgeQueue(request, requestId).get(); - sent = true; + if (systemContext.getEdgeService().isEdgeActiveAsync(tenantId, edgeId, DefaultDeviceStateService.ACTIVITY_STATE).get()) { + saveRpcRequestToEdgeQueue(request, requestId).get(); + } else { + log.error("[{}][{}][{}] Failed to save RPC request to edge queue {}. The Edge is currently offline or unreachable", tenantId, deviceId, edgeId.getId(), request); + } } catch (InterruptedException | ExecutionException e) { log.error("[{}][{}][{}] Failed to save RPC request to edge queue {}", tenantId, deviceId, edgeId.getId(), request, e); } @@ -470,7 +474,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso callback.onSuccess(); } - private void processUplinkNotificationMsg(SessionInfoProto sessionInfo, TransportProtos.UplinkNotificationMsg uplinkNotificationMsg) { + private void processUplinkNotificationMsg(SessionInfoProto sessionInfo, UplinkNotificationMsg uplinkNotificationMsg) { String nodeId = sessionInfo.getNodeId(); sessions.entrySet().stream() .filter(kv -> kv.getValue().getSessionInfo().getNodeId().equals(nodeId) && (kv.getValue().isSubscribedToAttributes() || kv.getValue().isSubscribedToRPC())) diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index cc6653f4c5..9110ab794d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -28,6 +28,7 @@ import org.thingsboard.rule.engine.api.RuleEngineAlarmService; import org.thingsboard.rule.engine.api.RuleEngineApiUsageStateService; import org.thingsboard.rule.engine.api.RuleEngineAssetProfileCache; import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache; +import org.thingsboard.rule.engine.api.RuleEngineDeviceStateManager; import org.thingsboard.rule.engine.api.RuleEngineRpcService; import org.thingsboard.rule.engine.api.RuleEngineTelemetryService; import org.thingsboard.rule.engine.api.ScriptEngine; @@ -108,6 +109,7 @@ import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.queue.TbQueueCallback; import org.thingsboard.server.queue.TbQueueMsgMetadata; import org.thingsboard.server.service.executors.PubSubRuleNodeExecutorProvider; +import org.thingsboard.server.queue.common.SimpleTbQueueCallback; import org.thingsboard.server.service.script.RuleNodeJsScriptEngine; import org.thingsboard.server.service.script.RuleNodeTbelScriptEngine; @@ -213,7 +215,19 @@ class DefaultTbContext implements TbContext { if (nodeCtx.getSelf().isDebugMode()) { mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), tbMsg, "To Root Rule Chain"); } - mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg, new SimpleTbQueueCallback(onSuccess, onFailure)); + mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg, new SimpleTbQueueCallback( + metadata -> { + if (onSuccess != null) { + onSuccess.run(); + } + }, + t -> { + if (onFailure != null) { + onFailure.accept(t); + } else { + log.debug("[{}] Failed to put item into queue!", nodeCtx.getTenantId().getId(), t); + } + })); } @Override @@ -299,7 +313,19 @@ class DefaultTbContext implements TbContext { relationTypes.forEach(relationType -> mainCtx.persistDebugOutput(nodeCtx.getTenantId(), nodeCtx.getSelf().getId(), tbMsg, relationType, null, failureMessage)); } - mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg.build(), new SimpleTbQueueCallback(onSuccess, onFailure)); + mainCtx.getClusterService().pushMsgToRuleEngine(tpi, tbMsg.getId(), msg.build(), new SimpleTbQueueCallback( + metadata -> { + if (onSuccess != null) { + onSuccess.run(); + } + }, + t -> { + if (onFailure != null) { + onFailure.accept(t); + } else { + log.debug("[{}] Failed to put item into queue!", nodeCtx.getTenantId().getId(), t); + } + })); } @Override @@ -658,6 +684,16 @@ class DefaultTbContext implements TbContext { return mainCtx.getDeviceCredentialsService(); } + @Override + public RuleEngineDeviceStateManager getDeviceStateManager() { + return mainCtx.getDeviceStateManager(); + } + + @Override + public String getDeviceStateNodeRateLimitConfig() { + return mainCtx.getDeviceStateNodeRateLimitConfig(); + } + @Override public TbClusterService getClusterService() { return mainCtx.getClusterService(); @@ -952,29 +988,4 @@ class DefaultTbContext implements TbContext { return failureMessage; } - private class SimpleTbQueueCallback implements TbQueueCallback { - private final Runnable onSuccess; - private final Consumer onFailure; - - public SimpleTbQueueCallback(Runnable onSuccess, Consumer onFailure) { - this.onSuccess = onSuccess; - this.onFailure = onFailure; - } - - @Override - public void onSuccess(TbQueueMsgMetadata metadata) { - if (onSuccess != null) { - onSuccess.run(); - } - } - - @Override - public void onFailure(Throwable t) { - if (onFailure != null) { - onFailure.accept(t); - } else { - log.debug("[{}] Failed to put item into queue", nodeCtx.getTenantId(), t); - } - } - } } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java index e14ed8203b..870ccda60a 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -16,7 +16,6 @@ package org.thingsboard.server.actors.ruleChain; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.common.data.msg.TbNodeConnectionType; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.TbActorCtx; import org.thingsboard.server.actors.TbActorRef; @@ -29,6 +28,7 @@ import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.msg.TbNodeConnectionType; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; import org.thingsboard.server.common.data.relation.EntityRelation; diff --git a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java index 7791c7ee76..0b859e7b06 100644 --- a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java +++ b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java @@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.exception.TenantProfileNotFoundException; import org.thingsboard.server.common.data.limit.LimitedApi; import org.thingsboard.server.common.msg.tools.TbRateLimitsException; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.exception.ThingsboardErrorResponseHandler; import org.thingsboard.server.service.security.model.SecurityUser; diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java index ba4c2b1fbd..92441bf1cb 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java @@ -48,7 +48,7 @@ import org.thingsboard.server.common.data.security.event.UserSessionInvalidation import org.thingsboard.server.common.data.security.model.JwtPair; import org.thingsboard.server.common.data.security.model.SecuritySettings; import org.thingsboard.server.common.data.security.model.UserPasswordPolicy; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails; import org.thingsboard.server.service.security.model.ActivateUserRequest; diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java index 1696d5c20b..64536ddb54 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java @@ -43,7 +43,7 @@ import org.thingsboard.server.common.data.limit.LimitedApi; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.config.WebSocketConfiguration; import org.thingsboard.server.dao.tenant.TbTenantProfileCache; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.security.auth.jwt.JwtAuthenticationProvider; import org.thingsboard.server.service.security.model.SecurityUser; diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index e8339e3202..44d81902a8 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -126,6 +126,7 @@ public class ThingsboardInstallService { case "3.6.2": log.info("Upgrading ThingsBoard from version 3.6.2 to 3.6.3 ..."); databaseEntitiesUpgradeService.upgradeDatabase("3.6.2"); + systemDataLoaderService.updateDefaultNotificationConfigs(); //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache break; default: diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java index a10a48244b..2f157af70e 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor; import org.thingsboard.server.dao.asset.AssetProfileService; import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.attributes.AttributesService; @@ -149,6 +150,9 @@ public class EdgeContextComponent { @Autowired private ResourceService resourceService; + @Autowired + private NotificationRuleProcessor notificationRuleProcessor; + @Autowired private AlarmEdgeProcessor alarmProcessor; diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java index d3262039d5..026ca51e8d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java @@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.BooleanDataEntry; import org.thingsboard.server.common.data.kv.LongDataEntry; import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.data.notification.rule.trigger.EdgeConnectionTrigger; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.TbMsgMetaData; @@ -263,7 +264,8 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } private void onEdgeConnect(EdgeId edgeId, EdgeGrpcSession edgeGrpcSession) { - TenantId tenantId = edgeGrpcSession.getEdge().getTenantId(); + Edge edge = edgeGrpcSession.getEdge(); + TenantId tenantId = edge.getTenantId(); log.info("[{}][{}] edge [{}] connected successfully.", tenantId, edgeGrpcSession.getSessionId(), edgeId); sessions.put(edgeId, edgeGrpcSession); final Lock newEventLock = sessionNewEventsLocks.computeIfAbsent(edgeId, id -> new ReentrantLock()); @@ -276,7 +278,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i save(tenantId, edgeId, DefaultDeviceStateService.ACTIVITY_STATE, true); long lastConnectTs = System.currentTimeMillis(); save(tenantId, edgeId, DefaultDeviceStateService.LAST_CONNECT_TIME, lastConnectTs); - pushRuleEngineMessage(tenantId, edgeId, lastConnectTs, TbMsgType.CONNECT_EVENT); + pushRuleEngineMessage(tenantId, edge, lastConnectTs, TbMsgType.CONNECT_EVENT); cancelScheduleEdgeEventsCheck(edgeId); scheduleEdgeEventsCheck(edgeGrpcSession); } @@ -381,7 +383,8 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } } - private void onEdgeDisconnect(EdgeId edgeId, UUID sessionId) { + private void onEdgeDisconnect(Edge edge, UUID sessionId) { + EdgeId edgeId = edge.getId(); log.info("[{}][{}] edge disconnected!", edgeId, sessionId); EdgeGrpcSession toRemove = sessions.get(edgeId); if (toRemove.getSessionId().equals(sessionId)) { @@ -397,7 +400,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i save(tenantId, edgeId, DefaultDeviceStateService.ACTIVITY_STATE, false); long lastDisconnectTs = System.currentTimeMillis(); save(tenantId, edgeId, DefaultDeviceStateService.LAST_DISCONNECT_TIME, lastDisconnectTs); - pushRuleEngineMessage(toRemove.getEdge().getTenantId(), edgeId, lastDisconnectTs, TbMsgType.DISCONNECT_EVENT); + pushRuleEngineMessage(toRemove.getEdge().getTenantId(), edge, lastDisconnectTs, TbMsgType.DISCONNECT_EVENT); cancelScheduleEdgeEventsCheck(edgeId); } else { log.debug("[{}] edge session [{}] is not available anymore, nothing to remove. most probably this session is already outdated!", edgeId, sessionId); @@ -452,25 +455,36 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } } - private void pushRuleEngineMessage(TenantId tenantId, EdgeId edgeId, long ts, TbMsgType msgType) { + private void pushRuleEngineMessage(TenantId tenantId, Edge edge, long ts, TbMsgType msgType) { try { + EdgeId edgeId = edge.getId(); ObjectNode edgeState = JacksonUtil.newObjectNode(); - if (msgType.equals(TbMsgType.CONNECT_EVENT)) { + boolean isConnected = TbMsgType.CONNECT_EVENT.equals(msgType); + if (isConnected) { edgeState.put(DefaultDeviceStateService.ACTIVITY_STATE, true); edgeState.put(DefaultDeviceStateService.LAST_CONNECT_TIME, ts); } else { edgeState.put(DefaultDeviceStateService.ACTIVITY_STATE, false); edgeState.put(DefaultDeviceStateService.LAST_DISCONNECT_TIME, ts); } + ctx.getNotificationRuleProcessor().process(EdgeConnectionTrigger.builder() + .tenantId(tenantId) + .customerId(edge.getCustomerId()) + .edgeId(edgeId) + .edgeName(edge.getName()) + .connected(isConnected).build()); String data = JacksonUtil.toString(edgeState); TbMsgMetaData md = new TbMsgMetaData(); if (!persistToTelemetry) { md.putValue(DataConstants.SCOPE, DataConstants.SERVER_SCOPE); + md.putValue("edgeName", edge.getName()); + md.putValue("edgeType", edge.getType()); } TbMsg tbMsg = TbMsg.newMsg(msgType, edgeId, md, TbMsgDataType.JSON, data); clusterService.pushMsgToRuleEngine(tenantId, edgeId, tbMsg, null); } catch (Exception e) { - log.warn("[{}][{}] Failed to push {}", tenantId, edgeId, msgType, e); + log.warn("[{}][{}] Failed to push {}", tenantId, edge.getId(), msgType, e); } } + } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java index 5e6f7a263e..98346674ae 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java @@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; import org.thingsboard.server.common.data.kv.LongDataEntry; import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.notification.rule.trigger.EdgeCommunicationFailureTrigger; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.SortOrder; @@ -111,7 +112,7 @@ public final class EdgeGrpcSession implements Closeable { private final UUID sessionId; private final BiConsumer sessionOpenListener; - private final BiConsumer sessionCloseListener; + private final BiConsumer sessionCloseListener; private final EdgeSessionState sessionState = new EdgeSessionState(); @@ -137,7 +138,7 @@ public final class EdgeGrpcSession implements Closeable { private ScheduledExecutorService sendDownlinkExecutorService; EdgeGrpcSession(EdgeContextComponent ctx, StreamObserver outputStream, BiConsumer sessionOpenListener, - BiConsumer sessionCloseListener, ScheduledExecutorService sendDownlinkExecutorService, int maxInboundMessageSize) { + BiConsumer sessionCloseListener, ScheduledExecutorService sendDownlinkExecutorService, int maxInboundMessageSize) { this.sessionId = UUID.randomUUID(); this.ctx = ctx; this.outputStream = outputStream; @@ -206,7 +207,7 @@ public final class EdgeGrpcSession implements Closeable { connected = false; if (edge != null) { try { - sessionCloseListener.accept(edge.getId(), sessionId); + sessionCloseListener.accept(edge, sessionId); } catch (Exception ignored) { } } @@ -314,7 +315,7 @@ public final class EdgeGrpcSession implements Closeable { } catch (Exception e) { log.error("[{}][{}] Failed to send downlink message [{}]", this.tenantId, this.sessionId, downlinkMsg, e); connected = false; - sessionCloseListener.accept(edge.getId(), sessionId); + sessionCloseListener.accept(edge, sessionId); } finally { downlinkMsgLock.unlock(); } @@ -466,15 +467,26 @@ public final class EdgeGrpcSession implements Closeable { if (isConnected() && sessionState.getPendingMsgsMap().values().size() > 0) { List copy = new ArrayList<>(sessionState.getPendingMsgsMap().values()); if (attempt > 1) { - log.warn("[{}][{}] Failed to deliver the batch: {}, attempt: {}", this.tenantId, this.sessionId, copy, attempt); + String error = "Failed to deliver the batch"; + String failureMsg = String.format("{%s}: {%s}", error, copy); + if (attempt == 2) { + // Send a failure notification only on the second attempt. + // This ensures that failure alerts are sent just once to avoid redundant notifications. + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId) + .edgeId(edge.getId()).customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg).error(error).build()); + } + log.warn("[{}][{}] {}, attempt: {}", this.tenantId, this.sessionId, failureMsg, attempt); } log.trace("[{}][{}][{}] downlink msg(s) are going to be send.", this.tenantId, this.sessionId, copy.size()); for (DownlinkMsg downlinkMsg : copy) { if (this.clientMaxInboundMessageSize != 0 && downlinkMsg.getSerializedSize() > this.clientMaxInboundMessageSize) { - log.error("[{}][{}][{}] Downlink msg size [{}] exceeds client max inbound message size [{}]. Skipping this message. " + - "Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE env variable on the edge and restart it." + - "Message {}", this.tenantId, edge.getId(), this.sessionId, downlinkMsg.getSerializedSize(), - this.clientMaxInboundMessageSize, downlinkMsg); + String error = String.format("Client max inbound message size [{%s}] is exceeded. Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE " + + "env variable on the edge and restart it.", this.clientMaxInboundMessageSize); + String message = String.format("Downlink msg size [{%s}] exceeds client max inbound message size [{%s}]. " + + "Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE env variable on the edge and restart it.", downlinkMsg.getSerializedSize(), this.clientMaxInboundMessageSize); + log.error("[{}][{}][{}] {} Message {}", this.tenantId, edge.getId(), this.sessionId, message, downlinkMsg); + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId) + .edgeId(edge.getId()).customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(message).error(error).build()); sessionState.getPendingMsgsMap().remove(downlinkMsg.getDownlinkMsgId()); } else { sendDownlinkMsg(ResponseMsg.newBuilder() @@ -485,8 +497,12 @@ public final class EdgeGrpcSession implements Closeable { if (attempt < MAX_DOWNLINK_ATTEMPTS) { scheduleDownlinkMsgsPackSend(attempt + 1); } else { + String failureMsg = String.format("Failed to deliver messages: %s", copy); log.warn("[{}][{}] Failed to deliver the batch after {} attempts. Next messages are going to be discarded {}", this.tenantId, this.sessionId, MAX_DOWNLINK_ATTEMPTS, copy); + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId).edgeId(edge.getId()) + .customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg) + .error("Failed to deliver messages after " + MAX_DOWNLINK_ATTEMPTS + " attempts").build()); stopCurrentSendDownlinkMsgsTask(false); } } else { @@ -791,7 +807,10 @@ public final class EdgeGrpcSession implements Closeable { } } } catch (Exception e) { + String failureMsg = String.format("Can't process uplink msg [%s] from edge", uplinkMsg); log.error("[{}][{}] Can't process uplink msg [{}]", this.tenantId, this.sessionId, uplinkMsg, e); + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId).edgeId(edge.getId()) + .customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg).error(e.getMessage()).build()); return Futures.immediateFailedFuture(e); } return Futures.allAsList(result); @@ -815,15 +834,22 @@ public final class EdgeGrpcSession implements Closeable { .setMaxInboundMessageSize(maxInboundMessageSize) .build(); } + String error = "Failed to validate the edge!"; + String failureMsg = String.format("{%s} Provided request secret: %s", error, request.getEdgeSecret()); + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId).edgeId(edge.getId()) + .customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg).error(error).build()); return ConnectResponseMsg.newBuilder() .setResponseCode(ConnectResponseCode.BAD_CREDENTIALS) - .setErrorMsg("Failed to validate the edge!") + .setErrorMsg(failureMsg) .setConfiguration(EdgeConfiguration.getDefaultInstance()).build(); } catch (Exception e) { - log.error("[{}] Failed to process edge connection!", request.getEdgeRoutingKey(), e); + String failureMsg = "Failed to process edge connection!"; + ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId).edgeId(edge.getId()) + .customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg).error(e.getMessage()).build()); + log.error(failureMsg, e); return ConnectResponseMsg.newBuilder() .setResponseCode(ConnectResponseCode.SERVER_UNAVAILABLE) - .setErrorMsg("Failed to process edge connection!") + .setErrorMsg(failureMsg) .setConfiguration(EdgeConfiguration.getDefaultInstance()).build(); } } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java index 2a191dfaf4..118cc0ccd4 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java @@ -18,6 +18,7 @@ package org.thingsboard.server.service.edge.rpc.processor.rule; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.EdgeUtils; +import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.edge.EdgeEvent; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.rule.RuleChain; @@ -53,6 +54,10 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor { isRoot = Boolean.parseBoolean(edgeEvent.getBody().get(EDGE_IS_ROOT_BODY_KEY).asText()); } catch (Exception ignored) {} } + if (!isRoot) { + Edge edge = edgeService.findEdgeById(edgeEvent.getTenantId(), edgeEvent.getEdgeId()); + isRoot = edge.getRootRuleChainId().equals(ruleChainId); + } UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction()); RuleChainUpdateMsg ruleChainUpdateMsg = ((RuleChainMsgConstructor) ruleChainMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)) diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/queue/DefaultTbQueueService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/queue/DefaultTbQueueService.java index cbef97d134..f58a55678a 100644 --- a/application/src/main/java/org/thingsboard/server/service/entitiy/queue/DefaultTbQueueService.java +++ b/application/src/main/java/org/thingsboard/server/service/entitiy/queue/DefaultTbQueueService.java @@ -50,22 +50,15 @@ public class DefaultTbQueueService extends AbstractTbEntityService implements Tb public Queue saveQueue(Queue queue) { boolean create = queue.getId() == null; Queue oldQueue; - if (create) { oldQueue = null; } else { oldQueue = queueService.findQueueById(queue.getTenantId(), queue.getId()); } - //TODO: add checkNotNull Queue savedQueue = queueService.saveQueue(queue); - - if (create) { - onQueueCreated(savedQueue); - } else { - onQueueUpdated(savedQueue, oldQueue); - } - + createTopicsIfNeeded(savedQueue, oldQueue); + tbClusterService.onQueuesUpdate(List.of(savedQueue)); return savedQueue; } @@ -73,54 +66,14 @@ public class DefaultTbQueueService extends AbstractTbEntityService implements Tb public void deleteQueue(TenantId tenantId, QueueId queueId) { Queue queue = queueService.findQueueById(tenantId, queueId); queueService.deleteQueue(tenantId, queueId); - onQueueDeleted(queue); + tbClusterService.onQueuesDelete(List.of(queue)); } @Override public void deleteQueueByQueueName(TenantId tenantId, String queueName) { Queue queue = queueService.findQueueByTenantIdAndNameInternal(tenantId, queueName); queueService.deleteQueue(tenantId, queue.getId()); - onQueueDeleted(queue); - } - - private void onQueueCreated(Queue queue) { - for (int i = 0; i < queue.getPartitions(); i++) { - tbQueueAdmin.createTopicIfNotExists( - new TopicPartitionInfo(queue.getTopic(), queue.getTenantId(), i, false).getFullTopicName(), - queue.getCustomProperties() - ); - } - - tbClusterService.onQueueChange(queue); - } - - private void onQueueUpdated(Queue queue, Queue oldQueue) { - int oldPartitions = oldQueue.getPartitions(); - int currentPartitions = queue.getPartitions(); - - if (currentPartitions != oldPartitions) { - if (currentPartitions > oldPartitions) { - log.info("Added [{}] new partitions to [{}] queue", currentPartitions - oldPartitions, queue.getName()); - for (int i = oldPartitions; i < currentPartitions; i++) { - tbQueueAdmin.createTopicIfNotExists( - new TopicPartitionInfo(queue.getTopic(), queue.getTenantId(), i, false).getFullTopicName(), - queue.getCustomProperties() - ); - } - tbClusterService.onQueueChange(queue); - } else { - log.info("Removed [{}] partitions from [{}] queue", oldPartitions - currentPartitions, queue.getName()); - tbClusterService.onQueueChange(queue); - // TODO: move all the messages left in old partitions and delete topics - } - } else if (!oldQueue.equals(queue)) { - tbClusterService.onQueueChange(queue); - } - } - - private void onQueueDeleted(Queue queue) { - tbClusterService.onQueueDelete(queue); -// queueStatsService.deleteQueueStatsByQueueId(tenantId, queueId); + tbClusterService.onQueuesDelete(List.of(queue)); } @Override @@ -176,26 +129,56 @@ public class DefaultTbQueueService extends AbstractTbEntityService implements Tb log.debug("[{}] Handling profile queue config update: creating queues {}, updating {}, deleting {}. Affected tenants: {}", newTenantProfile.getUuidId(), toCreate, toUpdate, toRemove, tenantIds); } - tenantIds.forEach(tenantId -> { - toCreate.forEach(key -> saveQueue(new Queue(tenantId, newQueues.get(key)))); - toUpdate.forEach(key -> { - Queue queueToUpdate = new Queue(tenantId, newQueues.get(key)); - Queue foundQueue = queueService.findQueueByTenantIdAndName(tenantId, key); - queueToUpdate.setId(foundQueue.getId()); - queueToUpdate.setCreatedTime(foundQueue.getCreatedTime()); + List updated = new ArrayList<>(); + List deleted = new ArrayList<>(); + for (TenantId tenantId : tenantIds) { + for (String name : toCreate) { + updated.add(new Queue(tenantId, newQueues.get(name))); + } - if (!queueToUpdate.equals(foundQueue)) { - saveQueue(queueToUpdate); + for (String name : toUpdate) { + Queue queue = new Queue(tenantId, newQueues.get(name)); + Queue foundQueue = queueService.findQueueByTenantIdAndName(tenantId, name); + if (foundQueue != null) { + queue.setId(foundQueue.getId()); + queue.setCreatedTime(foundQueue.getCreatedTime()); } - }); + if (!queue.equals(foundQueue)) { + updated.add(queue); + createTopicsIfNeeded(queue, foundQueue); + } + } + + for (String name : toRemove) { + Queue queue = queueService.findQueueByTenantIdAndNameInternal(tenantId, name); + deleted.add(queue); + } + } - toRemove.forEach(q -> { - Queue queue = queueService.findQueueByTenantIdAndNameInternal(tenantId, q); - QueueId queueIdForRemove = queue.getId(); - deleteQueue(tenantId, queueIdForRemove); + if (!updated.isEmpty()) { + updated = updated.stream() + .map(queueService::saveQueue) + .collect(Collectors.toList()); + tbClusterService.onQueuesUpdate(updated); + } + if (!deleted.isEmpty()) { + deleted.forEach(queue -> { + queueService.deleteQueue(queue.getTenantId(), queue.getId()); }); - }); + tbClusterService.onQueuesDelete(deleted); + } + } + + private void createTopicsIfNeeded(Queue queue, Queue oldQueue) { + int newPartitions = queue.getPartitions(); + int oldPartitions = oldQueue != null ? oldQueue.getPartitions() : 0; + for (int i = oldPartitions; i < newPartitions; i++) { + tbQueueAdmin.createTopicIfNotExists( + new TopicPartitionInfo(queue.getTopic(), queue.getTenantId(), i, false).getFullTopicName(), + queue.getCustomProperties() + ); + } } } diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java index b9f4dc482f..b20a548d90 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java @@ -691,7 +691,23 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { } @Override + @SneakyThrows public void updateDefaultNotificationConfigs() { + PageDataIterable tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500); + ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4)); + log.info("Updating default edge failure notification configs for all tenants"); + AtomicInteger count = new AtomicInteger(); + for (TenantId tenantId : tenants) { + executor.submit(() -> { + notificationSettingsService.updateDefaultNotificationConfigs(tenantId); + int n = count.incrementAndGet(); + if (n % 500 == 0) { + log.info("{} tenants processed", n); + } + }); + } + executor.shutdown(); + executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS); notificationSettingsService.updateDefaultNotificationConfigs(TenantId.SYS_TENANT_ID); } diff --git a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java index be37d98bb5..11c40d964a 100644 --- a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java +++ b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java @@ -62,7 +62,7 @@ import org.thingsboard.server.dao.notification.NotificationService; import org.thingsboard.server.dao.notification.NotificationSettingsService; import org.thingsboard.server.dao.notification.NotificationTargetService; import org.thingsboard.server.dao.notification.NotificationTemplateService; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.queue.common.TbProtoQueueMsg; import org.thingsboard.server.queue.discovery.TopicService; diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessor.java index a68708d8ae..a86315ce86 100644 --- a/application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessor.java @@ -41,7 +41,7 @@ import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.common.msg.queue.ServiceType; import org.thingsboard.server.dao.notification.NotificationRequestService; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.discovery.PartitionService; import org.thingsboard.server.queue.notification.NotificationDeduplicationService; import org.thingsboard.server.service.executors.NotificationExecutorService; diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java new file mode 100644 index 0000000000..38d8ae9805 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java @@ -0,0 +1,62 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.notification.rule.trigger; + +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.notification.info.EdgeCommunicationFailureNotificationInfo; +import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo; +import org.thingsboard.server.common.data.notification.rule.trigger.EdgeCommunicationFailureTrigger; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeCommunicationFailureNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType; + +@Service +@RequiredArgsConstructor +public class EdgeCommunicationFailureTriggerProcessor implements NotificationRuleTriggerProcessor { + + @Override + public boolean matchesFilter(EdgeCommunicationFailureTrigger trigger, EdgeCommunicationFailureNotificationRuleTriggerConfig triggerConfig) { + if (CollectionUtils.isNotEmpty(triggerConfig.getEdges())) { + return !triggerConfig.getEdges().contains(trigger.getEdgeId().getId()); + } + return true; + } + + @Override + public RuleOriginatedNotificationInfo constructNotificationInfo(EdgeCommunicationFailureTrigger trigger) { + return EdgeCommunicationFailureNotificationInfo.builder() + .tenantId(trigger.getTenantId()) + .edgeId(trigger.getEdgeId()) + .customerId(trigger.getCustomerId()) + .edgeName(trigger.getEdgeName()) + .failureMsg(truncateFailureMsg(trigger.getFailureMsg())) + .build(); + } + + @Override + public NotificationRuleTriggerType getTriggerType() { + return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE; + } + + private String truncateFailureMsg(String input) { + int maxLength = 500; + if (input != null && input.length() > maxLength) { + return input.substring(0, maxLength); + } + return input; + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java new file mode 100644 index 0000000000..ed1ee74622 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java @@ -0,0 +1,60 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.notification.rule.trigger; + +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.notification.info.EdgeConnectionNotificationInfo; +import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo; +import org.thingsboard.server.common.data.notification.rule.trigger.EdgeConnectionTrigger; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig.EdgeConnectivityEvent; +import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType; + +@Service +@RequiredArgsConstructor +public class EdgeConnectionTriggerProcessor implements NotificationRuleTriggerProcessor { + + @Override + public boolean matchesFilter(EdgeConnectionTrigger trigger, EdgeConnectionNotificationRuleTriggerConfig triggerConfig) { + EdgeConnectivityEvent event = trigger.isConnected() ? EdgeConnectivityEvent.CONNECTED : EdgeConnectivityEvent.DISCONNECTED; + if (CollectionUtils.isEmpty(triggerConfig.getNotifyOn()) || !triggerConfig.getNotifyOn().contains(event)) { + return false; + } + if (CollectionUtils.isNotEmpty(triggerConfig.getEdges())) { + return triggerConfig.getEdges().contains(trigger.getEdgeId().getId()); + } + return true; + } + + @Override + public RuleOriginatedNotificationInfo constructNotificationInfo(EdgeConnectionTrigger trigger) { + return EdgeConnectionNotificationInfo.builder() + .eventType(trigger.isConnected() ? "connected" : "disconnected") + .tenantId(trigger.getTenantId()) + .customerId(trigger.getCustomerId()) + .edgeId(trigger.getEdgeId()) + .edgeName(trigger.getEdgeName()) + .build(); + } + + @Override + public NotificationRuleTriggerType getTriggerType() { + return NotificationRuleTriggerType.EDGE_CONNECTION; + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java index ee05e82900..75e9e0ae2b 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java @@ -62,6 +62,8 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceNameOrTypeUpdateMsg; import org.thingsboard.server.dao.edge.EdgeService; import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.gen.transport.TransportProtos.FromDeviceRPCResponseProto; +import org.thingsboard.server.gen.transport.TransportProtos.QueueDeleteMsg; +import org.thingsboard.server.gen.transport.TransportProtos.QueueUpdateMsg; import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg; import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg; import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg; @@ -81,9 +83,11 @@ import org.thingsboard.server.service.profile.TbAssetProfileCache; import org.thingsboard.server.service.profile.TbDeviceProfileCache; import java.util.Optional; +import java.util.List; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import static org.thingsboard.server.common.util.ProtoUtils.toProto; @@ -563,40 +567,40 @@ public class DefaultTbClusterService implements TbClusterService { } @Override - public void onQueueChange(Queue queue) { - log.trace("[{}][{}] Processing queue change [{}] event", queue.getTenantId(), queue.getId(), queue.getName()); - - TransportProtos.QueueUpdateMsg queueUpdateMsg = TransportProtos.QueueUpdateMsg.newBuilder() - .setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits()) - .setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits()) - .setQueueIdMSB(queue.getId().getId().getMostSignificantBits()) - .setQueueIdLSB(queue.getId().getId().getLeastSignificantBits()) - .setQueueName(queue.getName()) - .setQueueTopic(queue.getTopic()) - .setPartitions(queue.getPartitions()) - .build(); - - ToRuleEngineNotificationMsg ruleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().setQueueUpdateMsg(queueUpdateMsg).build(); - ToCoreNotificationMsg coreMsg = ToCoreNotificationMsg.newBuilder().setQueueUpdateMsg(queueUpdateMsg).build(); - ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setQueueUpdateMsg(queueUpdateMsg).build(); + public void onQueuesUpdate(List queues) { + List queueUpdateMsgs = queues.stream() + .map(queue -> QueueUpdateMsg.newBuilder() + .setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits()) + .setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits()) + .setQueueIdMSB(queue.getId().getId().getMostSignificantBits()) + .setQueueIdLSB(queue.getId().getId().getLeastSignificantBits()) + .setQueueName(queue.getName()) + .setQueueTopic(queue.getTopic()) + .setPartitions(queue.getPartitions()) + .build()) + .collect(Collectors.toList()); + + ToRuleEngineNotificationMsg ruleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().addAllQueueUpdateMsgs(queueUpdateMsgs).build(); + ToCoreNotificationMsg coreMsg = ToCoreNotificationMsg.newBuilder().addAllQueueUpdateMsgs(queueUpdateMsgs).build(); + ToTransportMsg transportMsg = ToTransportMsg.newBuilder().addAllQueueUpdateMsgs(queueUpdateMsgs).build(); doSendQueueNotifications(ruleEngineMsg, coreMsg, transportMsg); } @Override - public void onQueueDelete(Queue queue) { - log.trace("[{}][{}] Processing queue delete [{}] event", queue.getTenantId(), queue.getId(), queue.getName()); - - TransportProtos.QueueDeleteMsg queueDeleteMsg = TransportProtos.QueueDeleteMsg.newBuilder() - .setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits()) - .setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits()) - .setQueueIdMSB(queue.getId().getId().getMostSignificantBits()) - .setQueueIdLSB(queue.getId().getId().getLeastSignificantBits()) - .setQueueName(queue.getName()) - .build(); - - ToRuleEngineNotificationMsg ruleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().setQueueDeleteMsg(queueDeleteMsg).build(); - ToCoreNotificationMsg coreMsg = ToCoreNotificationMsg.newBuilder().setQueueDeleteMsg(queueDeleteMsg).build(); - ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setQueueDeleteMsg(queueDeleteMsg).build(); + public void onQueuesDelete(List queues) { + List queueDeleteMsgs = queues.stream() + .map(queue -> QueueDeleteMsg.newBuilder() + .setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits()) + .setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits()) + .setQueueIdMSB(queue.getId().getId().getMostSignificantBits()) + .setQueueIdLSB(queue.getId().getId().getLeastSignificantBits()) + .setQueueName(queue.getName()) + .build()) + .collect(Collectors.toList()); + + ToRuleEngineNotificationMsg ruleEngineMsg = ToRuleEngineNotificationMsg.newBuilder().addAllQueueDeleteMsgs(queueDeleteMsgs).build(); + ToCoreNotificationMsg coreMsg = ToCoreNotificationMsg.newBuilder().addAllQueueDeleteMsgs(queueDeleteMsgs).build(); + ToTransportMsg transportMsg = ToTransportMsg.newBuilder().addAllQueueDeleteMsgs(queueDeleteMsgs).build(); doSendQueueNotifications(ruleEngineMsg, coreMsg, transportMsg); } diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java index 2d5e6963eb..5f1bc0c8ad 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java @@ -15,6 +15,9 @@ */ package org.thingsboard.server.service.queue; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -148,6 +151,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService 0) { + partitionService.updateQueues(toCoreNotification.getQueueUpdateMsgsList()); callback.onSuccess(); - } else if (toCoreNotification.hasQueueDeleteMsg()) { - TransportProtos.QueueDeleteMsg queue = toCoreNotification.getQueueDeleteMsg(); - partitionService.removeQueue(queue); + } else if (toCoreNotification.getQueueDeleteMsgsCount() > 0) { + partitionService.removeQueues(toCoreNotification.getQueueDeleteMsgsList()); callback.onSuccess(); } else if (toCoreNotification.hasVcResponseMsg()) { vcQueueService.processResponse(toCoreNotification.getVcResponseMsg()); @@ -643,25 +658,71 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService future = deviceActivityEventsExecutor.submit(() -> stateService.onDeviceConnect(tenantId, deviceId, deviceConnectMsg.getLastConnectTime())); + DonAsynchron.withCallback(future, + __ -> callback.onSuccess(), + t -> { + log.warn("[{}] Failed to process device connect message for device [{}]", tenantId.getId(), deviceId.getId(), t); + callback.onFailure(t); + }); + } + + void forwardToStateService(TransportProtos.DeviceActivityProto deviceActivityMsg, TbCallback callback) { if (statsEnabled) { stats.log(deviceActivityMsg); } - TenantId tenantId = toTenantId(deviceActivityMsg.getTenantIdMSB(), deviceActivityMsg.getTenantIdLSB()); - DeviceId deviceId = new DeviceId(new UUID(deviceActivityMsg.getDeviceIdMSB(), deviceActivityMsg.getDeviceIdLSB())); - try { - stateService.onDeviceActivity(tenantId, deviceId, deviceActivityMsg.getLastActivityTime()); - callback.onSuccess(); - } catch (Exception e) { - callback.onFailure(new RuntimeException("Failed update device activity for device [" + deviceId.getId() + "]!", e)); + var tenantId = toTenantId(deviceActivityMsg.getTenantIdMSB(), deviceActivityMsg.getTenantIdLSB()); + var deviceId = new DeviceId(new UUID(deviceActivityMsg.getDeviceIdMSB(), deviceActivityMsg.getDeviceIdLSB())); + ListenableFuture future = deviceActivityEventsExecutor.submit(() -> stateService.onDeviceActivity(tenantId, deviceId, deviceActivityMsg.getLastActivityTime())); + DonAsynchron.withCallback(future, + __ -> callback.onSuccess(), + t -> { + log.warn("[{}] Failed to process device activity message for device [{}]", tenantId.getId(), deviceId.getId(), t); + callback.onFailure(new RuntimeException("Failed to update device activity for device [" + deviceId.getId() + "]!", t)); + }); + } + + void forwardToStateService(TransportProtos.DeviceDisconnectProto deviceDisconnectMsg, TbCallback callback) { + if (statsEnabled) { + stats.log(deviceDisconnectMsg); + } + var tenantId = toTenantId(deviceDisconnectMsg.getTenantIdMSB(), deviceDisconnectMsg.getTenantIdLSB()); + var deviceId = new DeviceId(new UUID(deviceDisconnectMsg.getDeviceIdMSB(), deviceDisconnectMsg.getDeviceIdLSB())); + ListenableFuture future = deviceActivityEventsExecutor.submit(() -> stateService.onDeviceDisconnect(tenantId, deviceId, deviceDisconnectMsg.getLastDisconnectTime())); + DonAsynchron.withCallback(future, + __ -> callback.onSuccess(), + t -> { + log.warn("[{}] Failed to process device disconnect message for device [{}]", tenantId.getId(), deviceId.getId(), t); + callback.onFailure(t); + }); + } + + void forwardToStateService(TransportProtos.DeviceInactivityProto deviceInactivityMsg, TbCallback callback) { + if (statsEnabled) { + stats.log(deviceInactivityMsg); } + var tenantId = toTenantId(deviceInactivityMsg.getTenantIdMSB(), deviceInactivityMsg.getTenantIdLSB()); + var deviceId = new DeviceId(new UUID(deviceInactivityMsg.getDeviceIdMSB(), deviceInactivityMsg.getDeviceIdLSB())); + ListenableFuture future = deviceActivityEventsExecutor.submit(() -> stateService.onDeviceInactivity(tenantId, deviceId, deviceInactivityMsg.getLastInactivityTime())); + DonAsynchron.withCallback(future, + __ -> callback.onSuccess(), + t -> { + log.warn("[{}] Failed to process device inactivity message for device [{}]", tenantId.getId(), deviceId.getId(), t); + callback.onFailure(t); + }); } private void forwardToNotificationSchedulerService(TransportProtos.NotificationSchedulerServiceMsg msg, TbCallback callback) { diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java index 4ebce20b32..04f57bf54d 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java @@ -36,6 +36,8 @@ import org.thingsboard.server.common.util.ProtoUtils; import org.thingsboard.server.dao.queue.QueueService; import org.thingsboard.server.dao.tenant.TbTenantProfileCache; import org.thingsboard.server.gen.transport.TransportProtos; +import org.thingsboard.server.gen.transport.TransportProtos.QueueDeleteMsg; +import org.thingsboard.server.gen.transport.TransportProtos.QueueUpdateMsg; import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg; import org.thingsboard.server.queue.common.TbProtoQueueMsg; import org.thingsboard.server.queue.discovery.PartitionService; @@ -164,11 +166,11 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService< , proto.getResponse(), error); tbDeviceRpcService.processRpcResponseFromDevice(response); callback.onSuccess(); - } else if (nfMsg.hasQueueUpdateMsg()) { - updateQueue(nfMsg.getQueueUpdateMsg()); + } else if (nfMsg.getQueueUpdateMsgsCount() > 0) { + updateQueues(nfMsg.getQueueUpdateMsgsList()); callback.onSuccess(); - } else if (nfMsg.hasQueueDeleteMsg()) { - deleteQueue(nfMsg.getQueueDeleteMsg()); + } else if (nfMsg.getQueueDeleteMsgsCount() > 0) { + deleteQueues(nfMsg.getQueueDeleteMsgsList()); callback.onSuccess(); } else { log.trace("Received notification with missing handler"); @@ -176,39 +178,48 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService< } } - private void updateQueue(TransportProtos.QueueUpdateMsg queueUpdateMsg) { - log.info("Received queue update msg: [{}]", queueUpdateMsg); - TenantId tenantId = new TenantId(new UUID(queueUpdateMsg.getTenantIdMSB(), queueUpdateMsg.getTenantIdLSB())); - if (partitionService.isManagedByCurrentService(tenantId)) { - QueueId queueId = new QueueId(new UUID(queueUpdateMsg.getQueueIdMSB(), queueUpdateMsg.getQueueIdLSB())); - String queueName = queueUpdateMsg.getQueueName(); - QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueName, tenantId); - Queue queue = queueService.findQueueById(tenantId, queueId); - - TbRuleEngineQueueConsumerManager consumerManager = getOrCreateConsumer(queueKey); - Queue oldQueue = consumerManager.getQueue(); - consumerManager.update(queue); - - if (oldQueue != null && queue.getPartitions() == oldQueue.getPartitions()) { - return; + private void updateQueues(List queueUpdateMsgs) { + boolean partitionsChanged = false; + for (QueueUpdateMsg queueUpdateMsg : queueUpdateMsgs) { + log.info("Received queue update msg: [{}]", queueUpdateMsg); + TenantId tenantId = new TenantId(new UUID(queueUpdateMsg.getTenantIdMSB(), queueUpdateMsg.getTenantIdLSB())); + if (partitionService.isManagedByCurrentService(tenantId)) { + QueueId queueId = new QueueId(new UUID(queueUpdateMsg.getQueueIdMSB(), queueUpdateMsg.getQueueIdLSB())); + String queueName = queueUpdateMsg.getQueueName(); + QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueName, tenantId); + Queue queue = queueService.findQueueById(tenantId, queueId); + + TbRuleEngineQueueConsumerManager consumerManager = getOrCreateConsumer(queueKey); + Queue oldQueue = consumerManager.getQueue(); + consumerManager.update(queue); + + if (oldQueue == null || queue.getPartitions() != oldQueue.getPartitions()) { + partitionsChanged = true; + } + } else { + partitionsChanged = true; } } - partitionService.updateQueue(queueUpdateMsg); - partitionService.recalculatePartitions(ctx.getServiceInfoProvider().getServiceInfo(), - new ArrayList<>(partitionService.getOtherServices(ServiceType.TB_RULE_ENGINE))); + if (partitionsChanged) { + partitionService.updateQueues(queueUpdateMsgs); + partitionService.recalculatePartitions(ctx.getServiceInfoProvider().getServiceInfo(), + new ArrayList<>(partitionService.getOtherServices(ServiceType.TB_RULE_ENGINE))); + } } - private void deleteQueue(TransportProtos.QueueDeleteMsg queueDeleteMsg) { - log.info("Received queue delete msg: [{}]", queueDeleteMsg); - TenantId tenantId = new TenantId(new UUID(queueDeleteMsg.getTenantIdMSB(), queueDeleteMsg.getTenantIdLSB())); - QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueDeleteMsg.getQueueName(), tenantId); - var consumerManager = consumers.remove(queueKey); - if (consumerManager != null) { - consumerManager.delete(true); + private void deleteQueues(List queueDeleteMsgs) { + for (QueueDeleteMsg queueDeleteMsg : queueDeleteMsgs) { + log.info("Received queue delete msg: [{}]", queueDeleteMsg); + TenantId tenantId = new TenantId(new UUID(queueDeleteMsg.getTenantIdMSB(), queueDeleteMsg.getTenantIdLSB())); + QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueDeleteMsg.getQueueName(), tenantId); + var consumerManager = consumers.remove(queueKey); + if (consumerManager != null) { + consumerManager.delete(true); + } } - partitionService.removeQueue(queueDeleteMsg); + partitionService.removeQueues(queueDeleteMsgs); partitionService.recalculatePartitions(ctx.getServiceInfoProvider().getServiceInfo(), new ArrayList<>(partitionService.getOtherServices(ServiceType.TB_RULE_ENGINE))); } diff --git a/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java b/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java index 0fa15ad0b3..76175d86b1 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java @@ -37,7 +37,10 @@ public class TbCoreConsumerStats { public static final String DEVICE_STATES = "deviceState"; public static final String SUBSCRIPTION_MSGS = "subMsgs"; public static final String EDGE_NOTIFICATIONS = "edgeNfs"; + public static final String DEVICE_CONNECTS = "deviceConnect"; public static final String DEVICE_ACTIVITIES = "deviceActivity"; + public static final String DEVICE_DISCONNECTS = "deviceDisconnect"; + public static final String DEVICE_INACTIVITIES = "deviceInactivity"; public static final String TO_CORE_NF_OTHER = "coreNfOther"; // normally, there is no messages when codebase is fine public static final String TO_CORE_NF_COMPONENT_LIFECYCLE = "coreNfCompLfcl"; @@ -63,7 +66,10 @@ public class TbCoreConsumerStats { private final StatsCounter deviceStateCounter; private final StatsCounter subscriptionMsgCounter; private final StatsCounter edgeNotificationsCounter; + private final StatsCounter deviceConnectsCounter; private final StatsCounter deviceActivitiesCounter; + private final StatsCounter deviceDisconnectsCounter; + private final StatsCounter deviceInactivitiesCounter; private final StatsCounter toCoreNfOtherCounter; private final StatsCounter toCoreNfComponentLifecycleCounter; @@ -94,7 +100,10 @@ public class TbCoreConsumerStats { this.deviceStateCounter = register(statsFactory.createStatsCounter(statsKey, DEVICE_STATES)); this.subscriptionMsgCounter = register(statsFactory.createStatsCounter(statsKey, SUBSCRIPTION_MSGS)); this.edgeNotificationsCounter = register(statsFactory.createStatsCounter(statsKey, EDGE_NOTIFICATIONS)); + this.deviceConnectsCounter = register(statsFactory.createStatsCounter(statsKey, DEVICE_CONNECTS)); this.deviceActivitiesCounter = register(statsFactory.createStatsCounter(statsKey, DEVICE_ACTIVITIES)); + this.deviceDisconnectsCounter = register(statsFactory.createStatsCounter(statsKey, DEVICE_DISCONNECTS)); + this.deviceInactivitiesCounter = register(statsFactory.createStatsCounter(statsKey, DEVICE_INACTIVITIES)); // Core notification counters this.toCoreNfOtherCounter = register(statsFactory.createStatsCounter(statsKey, TO_CORE_NF_OTHER)); @@ -152,11 +161,26 @@ public class TbCoreConsumerStats { edgeNotificationsCounter.increment(); } + public void log(TransportProtos.DeviceConnectProto msg) { + totalCounter.increment(); + deviceConnectsCounter.increment(); + } + public void log(TransportProtos.DeviceActivityProto msg) { totalCounter.increment(); deviceActivitiesCounter.increment(); } + public void log(TransportProtos.DeviceDisconnectProto msg) { + totalCounter.increment(); + deviceDisconnectsCounter.increment(); + } + + public void log(TransportProtos.DeviceInactivityProto msg) { + totalCounter.increment(); + deviceInactivitiesCounter.increment(); + } + public void log(TransportProtos.SubscriptionMgrMsgProto msg) { totalCounter.increment(); subscriptionMsgCounter.increment(); @@ -184,9 +208,9 @@ public class TbCoreConsumerStats { toCoreNfEdgeSyncResponseCounter.increment(); } else if (!msg.getFromEdgeSyncResponseMsg().isEmpty()) { toCoreNfEdgeSyncResponseCounter.increment(); - } else if (msg.hasQueueUpdateMsg()) { + } else if (msg.getQueueUpdateMsgsCount() > 0) { toCoreNfQueueUpdateCounter.increment(); - } else if (msg.hasQueueDeleteMsg()) { + } else if (msg.getQueueDeleteMsgsCount() > 0) { toCoreNfQueueDeleteCounter.increment(); } else if (msg.hasVcResponseMsg()) { toCoreNfVersionControlResponseCounter.increment(); diff --git a/application/src/main/java/org/thingsboard/server/service/queue/TbMsgPackCallback.java b/application/src/main/java/org/thingsboard/server/service/queue/TbMsgPackCallback.java index d7ddd5d81b..1f9e85bdc7 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/TbMsgPackCallback.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/TbMsgPackCallback.java @@ -24,7 +24,6 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.queue.RuleEngineException; import org.thingsboard.server.common.msg.queue.RuleNodeInfo; import org.thingsboard.server.common.msg.queue.TbMsgCallback; -import org.thingsboard.server.common.msg.tools.TbRateLimitsException; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java index 0205059225..1ff7ba433b 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.service.queue.processing; +import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.queue.common.TbProtoQueueMsg; @@ -51,7 +52,16 @@ public abstract class AbstractTbRuleEngineSubmitStrategy implements TbRuleEngine List> newOrderedMsgList = new ArrayList<>(reprocessMap.size()); for (IdMsgPair pair : orderedMsgList) { if (reprocessMap.containsKey(pair.uuid)) { - newOrderedMsgList.add(pair); + if (StringUtils.isNotEmpty(pair.getMsg().getValue().getFailureMessage())) { + var toRuleEngineMsg = TransportProtos.ToRuleEngineMsg.newBuilder(pair.getMsg().getValue()) + .clearFailureMessage() + .clearRelationTypes() + .build(); + var newMsg = new TbProtoQueueMsg<>(pair.getMsg().getKey(), toRuleEngineMsg, pair.getMsg().getHeaders()); + newOrderedMsgList.add(new IdMsgPair<>(pair.getUuid(), newMsg)); + } else { + newOrderedMsgList.add(pair); + } } } orderedMsgList = newOrderedMsgList; diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/DefaultTwoFactorAuthService.java b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/DefaultTwoFactorAuthService.java index b2ebcb0b5d..d4425372e1 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/DefaultTwoFactorAuthService.java +++ b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/DefaultTwoFactorAuthService.java @@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProvi import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType; import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.common.data.limit.LimitedApi; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.security.auth.mfa.config.TwoFaConfigManager; import org.thingsboard.server.service.security.auth.mfa.provider.TwoFaProvider; diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java index e010cf3050..30c59b3da8 100644 --- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java +++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java @@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.exception.TenantNotFoundException; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.BooleanDataEntry; @@ -221,25 +222,35 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService 0 && lastReportedActivity > stateData.getState().getLastActivityTime()) { updateActivityState(deviceId, stateData, lastReportedActivity); @@ -261,37 +272,75 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService kvEntries, String attributeName, long defaultValue) { if (kvEntries != null) { for (KvEntry entry : kvEntries) { diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java new file mode 100644 index 0000000000..af2b03ec8f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java @@ -0,0 +1,196 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.state; + +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.thingsboard.rule.engine.api.RuleEngineDeviceStateManager; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.queue.ServiceType; +import org.thingsboard.server.common.msg.queue.TbCallback; +import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; +import org.thingsboard.server.gen.transport.TransportProtos; +import org.thingsboard.server.queue.common.SimpleTbQueueCallback; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; +import org.thingsboard.server.queue.util.TbRuleEngineComponent; + +import java.util.Optional; +import java.util.UUID; + +@Slf4j +@Service +@TbRuleEngineComponent +public class DefaultRuleEngineDeviceStateManager implements RuleEngineDeviceStateManager { + + private final TbServiceInfoProvider serviceInfoProvider; + private final PartitionService partitionService; + + private final Optional deviceStateService; + private final TbClusterService clusterService; + + public DefaultRuleEngineDeviceStateManager( + TbServiceInfoProvider serviceInfoProvider, PartitionService partitionService, + Optional deviceStateServiceOptional, TbClusterService clusterService + ) { + this.serviceInfoProvider = serviceInfoProvider; + this.partitionService = partitionService; + this.deviceStateService = deviceStateServiceOptional; + this.clusterService = clusterService; + } + + @Getter + private abstract static class ConnectivityEventInfo { + + private final TenantId tenantId; + private final DeviceId deviceId; + private final long eventTime; + + private ConnectivityEventInfo(TenantId tenantId, DeviceId deviceId, long eventTime) { + this.tenantId = tenantId; + this.deviceId = deviceId; + this.eventTime = eventTime; + } + + abstract void forwardToLocalService(); + + abstract TransportProtos.ToCoreMsg toQueueMsg(); + + } + + @Override + public void onDeviceConnect(TenantId tenantId, DeviceId deviceId, long connectTime, TbCallback callback) { + routeEvent(new ConnectivityEventInfo(tenantId, deviceId, connectTime) { + @Override + void forwardToLocalService() { + deviceStateService.ifPresent(service -> service.onDeviceConnect(tenantId, deviceId, connectTime)); + } + + @Override + TransportProtos.ToCoreMsg toQueueMsg() { + var deviceConnectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastConnectTime(connectTime) + .build(); + return TransportProtos.ToCoreMsg.newBuilder() + .setDeviceConnectMsg(deviceConnectMsg) + .build(); + } + }, callback); + } + + @Override + public void onDeviceActivity(TenantId tenantId, DeviceId deviceId, long activityTime, TbCallback callback) { + routeEvent(new ConnectivityEventInfo(tenantId, deviceId, activityTime) { + @Override + void forwardToLocalService() { + deviceStateService.ifPresent(service -> service.onDeviceActivity(tenantId, deviceId, activityTime)); + } + + @Override + TransportProtos.ToCoreMsg toQueueMsg() { + var deviceActivityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastActivityTime(activityTime) + .build(); + return TransportProtos.ToCoreMsg.newBuilder() + .setDeviceActivityMsg(deviceActivityMsg) + .build(); + } + }, callback); + } + + @Override + public void onDeviceDisconnect(TenantId tenantId, DeviceId deviceId, long disconnectTime, TbCallback callback) { + routeEvent(new ConnectivityEventInfo(tenantId, deviceId, disconnectTime) { + @Override + void forwardToLocalService() { + deviceStateService.ifPresent(service -> service.onDeviceDisconnect(tenantId, deviceId, disconnectTime)); + } + + @Override + TransportProtos.ToCoreMsg toQueueMsg() { + var deviceDisconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastDisconnectTime(disconnectTime) + .build(); + return TransportProtos.ToCoreMsg.newBuilder() + .setDeviceDisconnectMsg(deviceDisconnectMsg) + .build(); + } + }, callback); + } + + @Override + public void onDeviceInactivity(TenantId tenantId, DeviceId deviceId, long inactivityTime, TbCallback callback) { + routeEvent(new ConnectivityEventInfo(tenantId, deviceId, inactivityTime) { + @Override + void forwardToLocalService() { + deviceStateService.ifPresent(service -> service.onDeviceInactivity(tenantId, deviceId, inactivityTime)); + } + + @Override + TransportProtos.ToCoreMsg toQueueMsg() { + var deviceInactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastInactivityTime(inactivityTime) + .build(); + return TransportProtos.ToCoreMsg.newBuilder() + .setDeviceInactivityMsg(deviceInactivityMsg) + .build(); + } + }, callback); + } + + private void routeEvent(ConnectivityEventInfo eventInfo, TbCallback callback) { + var tenantId = eventInfo.getTenantId(); + var deviceId = eventInfo.getDeviceId(); + long eventTime = eventInfo.getEventTime(); + + TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenantId, deviceId); + if (serviceInfoProvider.isService(ServiceType.TB_CORE) && tpi.isMyPartition() && deviceStateService.isPresent()) { + log.debug("[{}][{}] Forwarding device connectivity event to local service. Event time: [{}].", tenantId.getId(), deviceId.getId(), eventTime); + try { + eventInfo.forwardToLocalService(); + } catch (Exception e) { + log.error("[{}][{}] Failed to process device connectivity event. Event time: [{}].", tenantId.getId(), deviceId.getId(), eventTime, e); + callback.onFailure(e); + return; + } + callback.onSuccess(); + } else { + TransportProtos.ToCoreMsg msg = eventInfo.toQueueMsg(); + log.debug("[{}][{}] Sending device connectivity message to core. Event time: [{}].", tenantId.getId(), deviceId.getId(), eventTime); + clusterService.pushMsgToCore(tpi, UUID.randomUUID(), msg, new SimpleTbQueueCallback(__ -> callback.onSuccess(), callback::onFailure)); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/state/DeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DeviceStateService.java index aa12b397a4..3ab5d29194 100644 --- a/application/src/main/java/org/thingsboard/server/service/state/DeviceStateService.java +++ b/application/src/main/java/org/thingsboard/server/service/state/DeviceStateService.java @@ -27,11 +27,21 @@ import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent; */ public interface DeviceStateService extends ApplicationListener { - void onDeviceConnect(TenantId tenantId, DeviceId deviceId); + void onDeviceConnect(TenantId tenantId, DeviceId deviceId, long lastConnectTime); + + default void onDeviceConnect(TenantId tenantId, DeviceId deviceId) { + onDeviceConnect(tenantId, deviceId, System.currentTimeMillis()); + } void onDeviceActivity(TenantId tenantId, DeviceId deviceId, long lastReportedActivityTime); - void onDeviceDisconnect(TenantId tenantId, DeviceId deviceId); + void onDeviceDisconnect(TenantId tenantId, DeviceId deviceId, long lastDisconnectTime); + + default void onDeviceDisconnect(TenantId tenantId, DeviceId deviceId) { + onDeviceDisconnect(tenantId, deviceId, System.currentTimeMillis()); + } + + void onDeviceInactivity(TenantId tenantId, DeviceId deviceId, long lastInactivityTime); void onDeviceInactivityTimeoutUpdate(TenantId tenantId, DeviceId deviceId, long inactivityTimeout); diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscription.java index 256a8ac89c..d1822a6ffe 100644 --- a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscription.java +++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscription.java @@ -36,8 +36,6 @@ public abstract class TbSubscription { private final TbSubscriptionType type; private final BiConsumer, T> updateProcessor; - protected final AtomicInteger sequence = new AtomicInteger(); - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java index 08a59973de..4e3d034207 100644 --- a/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java +++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java @@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.sync.ie.EntityImportResult; import org.thingsboard.server.common.data.util.ThrowingRunnable; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.relation.RelationService; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.service.entitiy.TbNotificationEntityService; import org.thingsboard.server.service.sync.ie.exporting.EntityExportService; diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationRuleExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationRuleExportService.java index 7a7d176f81..35f2489f83 100644 --- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationRuleExportService.java +++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationRuleExportService.java @@ -29,6 +29,8 @@ import org.thingsboard.server.common.data.notification.rule.EscalatedNotificatio import org.thingsboard.server.common.data.notification.rule.NotificationRule; import org.thingsboard.server.common.data.notification.rule.NotificationRuleRecipientsConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.DeviceActivityNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeCommunicationFailureNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.sync.ie.EntityExportData; @@ -65,13 +67,24 @@ public class NotificationRuleExportService ruleChains = triggerConfig.getRuleChains(); if (ruleChains != null) { triggerConfig.setRuleChains(toExternalIds(ruleChains, RuleChainId::new, ctx).collect(Collectors.toSet())); } break; + } + case EDGE_CONNECTION: { + EdgeConnectionNotificationRuleTriggerConfig triggerConfig = (EdgeConnectionNotificationRuleTriggerConfig) ruleTriggerConfig; + triggerConfig.setEdges(null); + break; + } + case EDGE_COMMUNICATION_FAILURE: { + EdgeCommunicationFailureNotificationRuleTriggerConfig triggerConfig = (EdgeCommunicationFailureNotificationRuleTriggerConfig) ruleTriggerConfig; + triggerConfig.setEdges(null); + break; + } } NotificationRuleRecipientsConfig ruleRecipientsConfig = notificationRule.getRecipientsConfig(); diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java index 72f0fa219e..dd53e5b5bc 100644 --- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java +++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java @@ -33,6 +33,8 @@ import org.thingsboard.server.common.data.notification.rule.EscalatedNotificatio import org.thingsboard.server.common.data.notification.rule.NotificationRule; import org.thingsboard.server.common.data.notification.rule.NotificationRuleRecipientsConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.DeviceActivityNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeCommunicationFailureNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType; import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig; @@ -86,7 +88,7 @@ public class NotificationRuleImportService extends BaseEntityImportService ruleChains = triggerConfig.getRuleChains(); if (ruleChains != null) { @@ -95,6 +97,17 @@ public class NotificationRuleImportService extends BaseEntityImportService void sendUpdate(String sessionId, int cmdId, T update) { + private void doSendUpdate(String sessionId, int cmdId, T update) { WsSessionMetaData md = wsSessionsMap.get(sessionId); if (md != null) { sendUpdate(md.getSessionRef(), cmdId, update); @@ -288,7 +288,7 @@ public class DefaultWebSocketService implements WebSocketService { try { msgEndpoint.close(md.getSessionRef(), status); } catch (IOException e) { - log.warn("[{}] Failed to send session close: {}", sessionId, e); + log.warn("[{}] Failed to send session close", sessionId, e); } } } @@ -439,7 +439,7 @@ public class DefaultWebSocketService implements WebSocketService { TbAttributeSubscription sub = TbAttributeSubscription.builder() .serviceId(serviceId) .sessionId(sessionId) - .subscriptionId(cmd.getCmdId()) + .subscriptionId(sessionRef.getSessionSubIdSeq().incrementAndGet()) .tenantId(sessionRef.getSecurityCtx().getTenantId()) .entityId(entityId) .queryTs(queryTs) @@ -449,7 +449,7 @@ public class DefaultWebSocketService implements WebSocketService { .updateProcessor((subscription, update) -> { subLock.lock(); try { - sendUpdate(subscription.getSessionId(), update); + sendUpdate(subscription.getSessionId(), cmd.getCmdId(), update); } finally { subLock.unlock(); } @@ -545,7 +545,7 @@ public class DefaultWebSocketService implements WebSocketService { TbAttributeSubscription sub = TbAttributeSubscription.builder() .serviceId(serviceId) .sessionId(sessionId) - .subscriptionId(cmd.getCmdId()) + .subscriptionId(sessionRef.getSessionSubIdSeq().incrementAndGet()) .tenantId(sessionRef.getSecurityCtx().getTenantId()) .entityId(entityId) .queryTs(queryTs) @@ -554,7 +554,7 @@ public class DefaultWebSocketService implements WebSocketService { .updateProcessor((subscription, update) -> { subLock.lock(); try { - sendUpdate(subscription.getSessionId(), update); + sendUpdate(subscription.getSessionId(), cmd.getCmdId(), update); } finally { subLock.unlock(); } @@ -643,13 +643,13 @@ public class DefaultWebSocketService implements WebSocketService { TbTimeSeriesSubscription sub = TbTimeSeriesSubscription.builder() .serviceId(serviceId) .sessionId(sessionId) - .subscriptionId(cmd.getCmdId()) + .subscriptionId(sessionRef.getSessionSubIdSeq().incrementAndGet()) .tenantId(sessionRef.getSecurityCtx().getTenantId()) .entityId(entityId) .updateProcessor((subscription, update) -> { subLock.lock(); try { - sendUpdate(subscription.getSessionId(), update); + sendUpdate(subscription.getSessionId(), cmd.getCmdId(), update); } finally { subLock.unlock(); } @@ -698,13 +698,13 @@ public class DefaultWebSocketService implements WebSocketService { TbTimeSeriesSubscription sub = TbTimeSeriesSubscription.builder() .serviceId(serviceId) .sessionId(sessionId) - .subscriptionId(cmd.getCmdId()) + .subscriptionId(sessionRef.getSessionSubIdSeq().incrementAndGet()) .tenantId(sessionRef.getSecurityCtx().getTenantId()) .entityId(entityId) .updateProcessor((subscription, update) -> { subLock.lock(); try { - sendUpdate(subscription.getSessionId(), update); + sendUpdate(subscription.getSessionId(), cmd.getCmdId(), update); } finally { subLock.unlock(); } @@ -836,7 +836,7 @@ public class DefaultWebSocketService implements WebSocketService { try { msgEndpoint.sendPing(md.getSessionRef(), currentTime); } catch (IOException e) { - log.warn("[{}] Failed to send ping: {}", md.getSessionRef().getSessionId(), e); + log.warn("[{}] Failed to send ping:", md.getSessionRef().getSessionId(), e); } })); } diff --git a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketService.java b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketService.java index dea7c9813b..8f586f264e 100644 --- a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketService.java +++ b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketService.java @@ -29,7 +29,7 @@ public interface WebSocketService { void handleCommands(WebSocketSessionRef sessionRef, WsCommandsWrapper commandsWrapper); - void sendUpdate(String sessionId, TelemetrySubscriptionUpdate update); + void sendUpdate(String sessionId, int cmdId, TelemetrySubscriptionUpdate update); void sendUpdate(String sessionId, CmdUpdate update); diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java index a5368e0f5e..f868a9d4f3 100644 --- a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java +++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java @@ -115,7 +115,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH private void fetchUnreadNotificationsCount(NotificationsCountSubscription subscription) { log.trace("[{}, subId: {}] Fetching unread notifications count from DB", subscription.getSessionId(), subscription.getSubscriptionId()); int unreadCount = notificationService.countUnreadNotificationsByRecipientId(subscription.getTenantId(), (UserId) subscription.getEntityId()); - subscription.getUnreadCounter().set(unreadCount); + subscription.getTotalUnreadCounter().set(unreadCount); } @@ -196,20 +196,20 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH private void handleNotificationUpdate(NotificationsCountSubscription subscription, NotificationUpdate update) { log.trace("[{}, subId: {}] Handling notification update for count sub: {}", subscription.getSessionId(), subscription.getSubscriptionId(), update); if (update.isCreated()) { - subscription.getUnreadCounter().incrementAndGet(); + subscription.getTotalUnreadCounter().incrementAndGet(); sendUpdate(subscription.getSessionId(), subscription.createUpdate()); } else if (update.isUpdated()) { if (update.getNewStatus() == NotificationStatus.READ) { if (update.isAllNotifications()) { fetchUnreadNotificationsCount(subscription); } else { - subscription.getUnreadCounter().decrementAndGet(); + subscription.getTotalUnreadCounter().decrementAndGet(); } sendUpdate(subscription.getSessionId(), subscription.createUpdate()); } } else if (update.isDeleted()) { if (update.getNotification().getStatus() != NotificationStatus.READ) { - subscription.getUnreadCounter().decrementAndGet(); + subscription.getTotalUnreadCounter().decrementAndGet(); sendUpdate(subscription.getSessionId(), subscription.createUpdate()); } } diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/AbstractNotificationSubscription.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/AbstractNotificationSubscription.java new file mode 100644 index 0000000000..37ba69589b --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/AbstractNotificationSubscription.java @@ -0,0 +1,38 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.ws.notification.sub; + + +import lombok.Getter; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.service.subscription.TbSubscription; +import org.thingsboard.server.service.subscription.TbSubscriptionType; + +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.BiConsumer; + +@Getter +public abstract class AbstractNotificationSubscription extends TbSubscription { + + protected final AtomicInteger sequence = new AtomicInteger(); + protected final AtomicInteger totalUnreadCounter = new AtomicInteger(); + + public AbstractNotificationSubscription(String serviceId, String sessionId, int subscriptionId, TenantId tenantId, EntityId entityId, TbSubscriptionType type, BiConsumer, T> updateProcessor) { + super(serviceId, sessionId, subscriptionId, tenantId, entityId, type, updateProcessor); + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/NotificationsCountSubscription.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/NotificationsCountSubscription.java index 145f69d6b6..1e812c3b31 100644 --- a/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/NotificationsCountSubscription.java +++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/sub/NotificationsCountSubscription.java @@ -27,9 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; @Getter -public class NotificationsCountSubscription extends TbSubscription { - - private final AtomicInteger unreadCounter = new AtomicInteger(); +public class NotificationsCountSubscription extends AbstractNotificationSubscription { @Builder public NotificationsCountSubscription(String serviceId, String sessionId, int subscriptionId, TenantId tenantId, EntityId entityId, @@ -40,7 +38,7 @@ public class NotificationsCountSubscription extends TbSubscription { +public class NotificationsSubscription extends AbstractNotificationSubscription { private final Map latestUnreadNotifications = new HashMap<>(); private final int limit; - private final AtomicInteger totalUnreadCounter = new AtomicInteger(); @Builder public NotificationsSubscription(String serviceId, String sessionId, int subscriptionId, TenantId tenantId, EntityId entityId, diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 70a5146bb7..34c30859c2 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -786,7 +786,7 @@ state: defaultInactivityTimeoutInSec: "${DEFAULT_INACTIVITY_TIMEOUT:600}" defaultStateCheckIntervalInSec: "${DEFAULT_STATE_CHECK_INTERVAL:60}" # Interval for checking the device state after a specified period. Time in seconds # Controls whether we store the device 'active' flag in attributes (default) or telemetry. - # If you device to change this parameter, you should re-create the device info view as one of the following: + # If you decide to change this parameter, you should re-create the device info view as one of the following: # If 'persistToTelemetry' is changed from 'false' to 'true': 'CREATE OR REPLACE VIEW device_info_view AS SELECT * FROM device_info_active_ts_view;' # If 'persistToTelemetry' is changed from 'true' to 'false': 'CREATE OR REPLACE VIEW device_info_view AS SELECT * FROM device_info_active_attribute_view;' persistToTelemetry: "${PERSIST_STATE_TO_TELEMETRY:false}" @@ -794,6 +794,15 @@ state: # Used only when state.persistToTelemetry is set to 'true' and Cassandra is used for timeseries data. # 0 means time-to-live mechanism is disabled. telemetryTtl: "${STATE_TELEMETRY_TTL:0}" + # Configuration properties for rule nodes related to device activity state + rule: + node: + # Device state rule node + deviceState: + # Defines the rate at which device connectivity events can be triggered. + # Comma-separated list of capacity:duration pairs that define bandwidth capacity and refill duration for token bucket rate limit algorithm. + # Refill is set to be greedy. Please refer to Bucket4j library documentation for more details. + rateLimit: "${DEVICE_STATE_NODE_RATE_LIMIT_CONFIGURATION:1:1,30:60,60:3600}" # Tbel parameters tbel: @@ -1044,6 +1053,8 @@ transport: dtls: # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000 retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}" + # "" disables connection id support, 0 enables support but not for incoming traffic, any value greater than 0 set the connection id size in bytes + connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:6}" server: # LwM2M Server ID id: "${LWM2M_SERVER_ID:123}" @@ -1173,14 +1184,18 @@ transport: bind_port: "${SNMP_BIND_PORT:1620}" response_processing: # parallelism level for executor (workStealingPool) that is responsible for handling responses from SNMP devices - parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:20}" + parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:4}" # to configure SNMP to work over UDP or TCP underlying_protocol: "${SNMP_UNDERLYING_PROTOCOL:udp}" - # Batch size to request OID mappings from the device (useful when the device profile has multiple hundreds of OID mappings) + # Maximum size of a PDU (amount of OID mappings in a single SNMP request). The request will be split into multiple PDUs if mappings amount exceeds this number max_request_oids: "${SNMP_MAX_REQUEST_OIDS:100}" + # Delay after sending each request chunk (in case the request was split into multiple PDUs due to max_request_oids) + request_chunk_delay_ms: "${SNMP_REQUEST_CHUNK_DELAY_MS:100}" response: # To ignore SNMP response values that do not match the data type of the configured OID mapping (by default false - will throw an error if any value of the response not match configured data types) ignore_type_cast_errors: "${SNMP_RESPONSE_IGNORE_TYPE_CAST_ERRORS:false}" + # Thread pool size for scheduler that executes device querying tasks + scheduler_thread_pool_size: "${SNMP_SCHEDULER_THREAD_POOL_SIZE:4}" stats: # Enable/Disable the collection of transport statistics enabled: "${TB_TRANSPORT_STATS_ENABLED:true}" diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java index 44302f08ba..314fe4c28c 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java @@ -154,24 +154,6 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest { Mockito.reset(tbClusterService, auditLogService); } - protected void testNotifyManyEntityManyTimeMsgToEdgeServiceNever(HasName entity, HasName originator, - TenantId tenantId, CustomerId customerId, UserId userId, String userName, - ActionType actionType, int cntTime, Object... additionalInfo) { - EntityId entityId = createEntityId_NULL_UUID(entity); - EntityId originatorId = createEntityId_NULL_UUID(originator); - testNotificationMsgToEdgeServiceNeverWithActionType(entityId, actionType); - ArgumentMatcher matcherEntityClassEquals = argument -> argument.getClass().equals(entity.getClass()); - ArgumentMatcher matcherOriginatorId = argument -> argument.getClass().equals(originatorId.getClass()); - ArgumentMatcher matcherCustomerId = customerId == null ? - argument -> argument.getClass().equals(CustomerId.class) : argument -> argument.equals(customerId); - ArgumentMatcher matcherUserId = userId == null ? - argument -> argument.getClass().equals(UserId.class) : argument -> argument.equals(userId); - testLogEntityActionAdditionalInfo(matcherEntityClassEquals, matcherOriginatorId, tenantId, matcherCustomerId, matcherUserId, userName, actionType, cntTime, - extractMatcherAdditionalInfo(additionalInfo)); - testPushMsgToRuleEngineTime(matcherOriginatorId, tenantId, entity, cntTime); - Mockito.reset(tbClusterService, auditLogService); - } - protected void testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(HasName entity, HasName originator, TenantId tenantId, CustomerId customerId, UserId userId, String userName, ActionType actionType, @@ -624,7 +606,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest { private String entityClassToString(HasName entity) { String className = entity.getClass().toString() .substring(entity.getClass().toString().lastIndexOf(".") + 1); - List str = className.chars() + List str = className.chars() .mapToObj(x -> (Character.isUpperCase(x)) ? "_" + Character.toString(x) : Character.toString(x)) .collect(Collectors.toList()); return String.join("", str).toUpperCase(Locale.ENGLISH).substring(1); diff --git a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java index 488bd4ed70..458bb3240e 100644 --- a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java @@ -711,7 +711,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest { edgeImitator.sendUplinkMsg(uplinkMsgBuilder.build()); Assert.assertTrue(edgeImitator.waitForResponses()); - Assert.assertTrue(onUpdateCallback.getSubscribeLatch().await(30, TimeUnit.SECONDS)); + Assert.assertTrue(onUpdateCallback.getSubscribeLatch().await(TIMEOUT, TimeUnit.SECONDS)); Assert.assertEquals(JacksonUtil.newObjectNode().put(attrKey, attrValue), JacksonUtil.fromBytes(onUpdateCallback.getPayloadBytes())); @@ -798,7 +798,21 @@ public class DeviceEdgeTest extends AbstractEdgeTest { // clean up stored edge events edgeEventService.cleanupEvents(1); - // perform rpc call to verify edgeId in DeviceActorMessageProcessor updated properly + // edge is disconnected: perform rpc call - no edge event saved + doPostAsync( + "/api/rpc/oneway/" + device.getId().getId().toString(), + JacksonUtil.toString(createDefaultRpc()), + String.class, + status().isOk()); + Awaitility.await() + .atMost(TIMEOUT, TimeUnit.SECONDS) + .until(() -> { + PageData result = edgeEventService.findEdgeEvents(tenantId, tmpEdge.getId(), 0L, null, new TimePageLink(1)); + return result.getTotalElements() == 0; + }); + + // edge is connected: perform rpc call to verify edgeId in DeviceActorMessageProcessor updated properly + simulateEdgeActivation(tmpEdge); doPostAsync( "/api/rpc/oneway/" + device.getId().getId().toString(), JacksonUtil.toString(createDefaultRpc()), @@ -857,4 +871,23 @@ public class DeviceEdgeTest extends AbstractEdgeTest { return rpc; } + + private void simulateEdgeActivation(Edge edge) throws Exception { + ObjectNode attributes = JacksonUtil.newObjectNode(); + attributes.put("active", true); + doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + DataConstants.SERVER_SCOPE, attributes); + Awaitility.await() + .atMost(TIMEOUT, TimeUnit.SECONDS) + .until(() -> { + List> values = doGetAsyncTyped("/api/plugins/telemetry/EDGE/" + edge.getId() + + "/values/attributes/SERVER_SCOPE", new TypeReference<>() {}); + Optional> activeAttrOpt = values.stream().filter(att -> att.get("key").equals("active")).findFirst(); + if (activeAttrOpt.isEmpty()) { + return false; + } + Map activeAttr = activeAttrOpt.get(); + return "true".equals(activeAttr.get("value").toString()); + }); + } + } diff --git a/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java index 4942dbdb9b..62d2c5eade 100644 --- a/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java @@ -146,7 +146,7 @@ public class RuleChainEdgeTest extends AbstractEdgeTest { } } - private void createRuleChainMetadata(RuleChain ruleChain) { + private RuleChainMetaData createRuleChainMetadata(RuleChain ruleChain) { RuleChainMetaData ruleChainMetaData = new RuleChainMetaData(); ruleChainMetaData.setRuleChainId(ruleChain.getId()); @@ -182,7 +182,7 @@ public class RuleChainEdgeTest extends AbstractEdgeTest { ruleChainMetaData.addConnectionInfo(0, 2, "fail"); ruleChainMetaData.addConnectionInfo(1, 2, "success"); - doPost("/api/ruleChain/metadata", ruleChainMetaData, RuleChainMetaData.class); + return doPost("/api/ruleChain/metadata", ruleChainMetaData, RuleChainMetaData.class); } @Test @@ -193,9 +193,10 @@ public class RuleChainEdgeTest extends AbstractEdgeTest { ruleChain.setType(RuleChainType.EDGE); RuleChain savedRuleChain = doPost("/api/ruleChain", ruleChain, RuleChain.class); - edgeImitator.expectMessageAmount(1); + edgeImitator.expectMessageAmount(2); doPost("/api/edge/" + edge.getUuidId() + "/ruleChain/" + savedRuleChain.getUuidId(), RuleChain.class); + RuleChainMetaData metaData = createRuleChainMetadata(savedRuleChain); Assert.assertTrue(edgeImitator.waitForMessages()); // set new rule chain as root @@ -213,6 +214,22 @@ public class RuleChainEdgeTest extends AbstractEdgeTest { Assert.assertTrue(ruleChainMsg.isRoot()); Assert.assertEquals(savedRuleChain.getId(), ruleChainMsg.getId()); + // update metadata for root rule chain + edgeImitator.expectMessageAmount(1); + metaData.getNodes().forEach(n -> n.setDebugMode(true)); + doPost("/api/ruleChain/metadata", metaData, RuleChainMetaData.class); + Assert.assertTrue(edgeImitator.waitForMessages()); + ruleChainUpdateMsgOpt = edgeImitator.findMessageByType(RuleChainUpdateMsg.class); + Assert.assertTrue(ruleChainUpdateMsgOpt.isPresent()); + ruleChainUpdateMsg = ruleChainUpdateMsgOpt.get(); + ruleChainMsg = JacksonUtil.fromString(ruleChainUpdateMsg.getEntity(), RuleChain.class, true); + Assert.assertNotNull(ruleChainMsg); + Assert.assertTrue(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE.equals(ruleChainUpdateMsg.getMsgType()) || + UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE.equals(ruleChainUpdateMsg.getMsgType())); + Assert.assertEquals(savedRuleChain.getId(), ruleChainMsg.getId()); + Assert.assertEquals(savedRuleChain.getName(), ruleChainMsg.getName()); + Assert.assertTrue(ruleChainMsg.isRoot()); + // revert root rule chain edgeImitator.expectMessageAmount(1); doPost("/api/edge/" + edge.getUuidId() diff --git a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java index f5e018ed3a..916e5790e9 100644 --- a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java +++ b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java @@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.checkerframework.checker.nullness.qual.Nullable; import org.thingsboard.edge.rpc.EdgeGrpcClient; import org.thingsboard.edge.rpc.EdgeRpcClient; +import org.thingsboard.server.controller.AbstractWebTest; import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg; import org.thingsboard.server.gen.edge.v1.AlarmCommentUpdateMsg; import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg; @@ -72,8 +73,6 @@ import java.util.stream.Collectors; @Slf4j public class EdgeImitator { - public static final int TIMEOUT_IN_SECONDS = 30; - private String routingKey; private String routingSecret; @@ -344,7 +343,7 @@ public class EdgeImitator { } public boolean waitForMessages() throws InterruptedException { - return waitForMessages(TIMEOUT_IN_SECONDS); + return waitForMessages(AbstractWebTest.TIMEOUT); } public boolean waitForMessages(int timeoutInSeconds) throws InterruptedException { @@ -359,7 +358,7 @@ public class EdgeImitator { } public boolean waitForResponses() throws InterruptedException { - return responsesLatch.await(TIMEOUT_IN_SECONDS, TimeUnit.SECONDS); + return responsesLatch.await(AbstractWebTest.TIMEOUT, TimeUnit.SECONDS); } public void expectResponsesAmount(int messageAmount) { diff --git a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java index 14d017a7a4..7f8515f50b 100644 --- a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java @@ -315,7 +315,7 @@ public class HashPartitionServiceTest { .setPartitions(isolatedQueue.getPartitions()) .build(); - partitionService_common.updateQueue(queueUpdateMsg); + partitionService_common.updateQueues(List.of(queueUpdateMsg)); partitionService_common.recalculatePartitions(commonRuleEngine, List.of(dedicatedRuleEngine)); // expecting event about no partitions for isolated queue key verifyPartitionChangeEvent(event -> { @@ -323,7 +323,7 @@ public class HashPartitionServiceTest { return event.getPartitionsMap().get(queueKey).isEmpty(); }); - partitionService_dedicated.updateQueue(queueUpdateMsg); + partitionService_dedicated.updateQueues(List.of(queueUpdateMsg)); partitionService_dedicated.recalculatePartitions(dedicatedRuleEngine, List.of(commonRuleEngine)); verifyPartitionChangeEvent(event -> { QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, DataConstants.MAIN_QUEUE_NAME, tenantId); @@ -342,7 +342,7 @@ public class HashPartitionServiceTest { .setQueueIdLSB(isolatedQueue.getUuidId().getLeastSignificantBits()) .setQueueName(isolatedQueue.getName()) .build(); - partitionService_dedicated.removeQueue(queueDeleteMsg); + partitionService_dedicated.removeQueues(List.of(queueDeleteMsg)); verifyPartitionChangeEvent(event -> { QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, DataConstants.MAIN_QUEUE_NAME, tenantId); return event.getPartitionsMap().get(queueKey).isEmpty(); diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructorTest.java index ce6ca753b3..d6bfbf1036 100644 --- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructorTest.java +++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructorTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.service.edge.rpc.constructor; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; @@ -61,7 +60,7 @@ public class RuleChainMsgConstructorTest { } @Test - public void testConstructRuleChainMetadataUpdatedMsg_V_3_4_0() throws JsonProcessingException { + public void testConstructRuleChainMetadataUpdatedMsg_V_3_4_0() { RuleChainId ruleChainId = new RuleChainId(UUID.randomUUID()); RuleChainMetaData ruleChainMetaData = createRuleChainMetaData( ruleChainId, 3, createRuleNodes(ruleChainId), createConnections()); @@ -80,7 +79,7 @@ public class RuleChainMsgConstructorTest { } @Test - public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_3() throws JsonProcessingException { + public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_3() { RuleChainId ruleChainId = new RuleChainId(UUID.randomUUID()); RuleChainMetaData ruleChainMetaData = createRuleChainMetaData( ruleChainId, 3, createRuleNodes(ruleChainId), createConnections()); @@ -120,7 +119,7 @@ public class RuleChainMsgConstructorTest { } @Test - public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_0() throws JsonProcessingException { + public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_0() { RuleChainId ruleChainId = new RuleChainId(UUID.randomUUID()); RuleChainMetaData ruleChainMetaData = createRuleChainMetaData(ruleChainId, 3, createRuleNodes(ruleChainId), createConnections()); RuleChainMetadataUpdateMsg ruleChainMetadataUpdateMsg = @@ -161,7 +160,7 @@ public class RuleChainMsgConstructorTest { } @Test - public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_0_inDifferentOrder() throws JsonProcessingException { + public void testConstructRuleChainMetadataUpdatedMsg_V_3_3_0_inDifferentOrder() { // same rule chain metadata, but different order of rule nodes RuleChainId ruleChainId = new RuleChainId(UUID.randomUUID()); RuleChainMetaData ruleChainMetaData1 = createRuleChainMetaData(ruleChainId, 8, createRuleNodesInDifferentOrder(ruleChainId), createConnectionsInDifferentOrder()); @@ -254,7 +253,7 @@ public class RuleChainMsgConstructorTest { return result; } - private List createRuleNodes(RuleChainId ruleChainId) throws JsonProcessingException { + private List createRuleNodes(RuleChainId ruleChainId) { List result = new ArrayList<>(); result.add(getOutputNode(ruleChainId)); result.add(getAcknowledgeNode(ruleChainId)); @@ -301,7 +300,7 @@ public class RuleChainMsgConstructorTest { return result; } - private List createRuleNodesInDifferentOrder(RuleChainId ruleChainId) throws JsonProcessingException { + private List createRuleNodesInDifferentOrder(RuleChainId ruleChainId) { List result = new ArrayList<>(); result.add(getPushToAnalyticsNode(ruleChainId)); result.add(getPushToCloudNode(ruleChainId)); @@ -319,99 +318,99 @@ public class RuleChainMsgConstructorTest { } - private RuleNode getOutputNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getOutputNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.flow.TbRuleChainOutputNode", "Output node", - JacksonUtil.OBJECT_MAPPER.readTree("{\"version\":0}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"description\":\"\",\"layoutX\":178,\"layoutY\":592}")); + JacksonUtil.toJsonNode("{\"version\":0}"), + JacksonUtil.toJsonNode("{\"description\":\"\",\"layoutX\":178,\"layoutY\":592}")); } - private RuleNode getCheckpointNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getCheckpointNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.flow.TbCheckpointNode", "Checkpoint node", - JacksonUtil.OBJECT_MAPPER.readTree("{\"queueName\":\"HighPriority\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"description\":\"\",\"layoutX\":178,\"layoutY\":647}")); + JacksonUtil.toJsonNode("{\"queueName\":\"HighPriority\"}"), + JacksonUtil.toJsonNode("{\"description\":\"\",\"layoutX\":178,\"layoutY\":647}")); } - private RuleNode getSaveTimeSeriesNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getSaveTimeSeriesNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "Save Timeseries", - JacksonUtil.OBJECT_MAPPER.readTree("{\"defaultTTL\":0}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":823,\"layoutY\":157}")); + JacksonUtil.toJsonNode("{\"defaultTTL\":0}"), + JacksonUtil.toJsonNode("{\"layoutX\":823,\"layoutY\":157}")); } - private RuleNode getMessageTypeSwitchNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getMessageTypeSwitchNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode", "Message Type Switch", - JacksonUtil.OBJECT_MAPPER.readTree("{\"version\":0}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":347,\"layoutY\":149}")); + JacksonUtil.toJsonNode("{\"version\":0}"), + JacksonUtil.toJsonNode("{\"layoutX\":347,\"layoutY\":149}")); } - private RuleNode getLogOtherNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getLogOtherNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.action.TbLogNode", "Log Other", - JacksonUtil.OBJECT_MAPPER.readTree("{\"jsScript\":\"return '\\\\nIncoming message:\\\\n' + JSON.stringify(msg) + '\\\\nIncoming metadata:\\\\n' + JSON.stringify(metadata);\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":824,\"layoutY\":378}")); + JacksonUtil.toJsonNode("{\"jsScript\":\"return '\\\\nIncoming message:\\\\n' + JSON.stringify(msg) + '\\\\nIncoming metadata:\\\\n' + JSON.stringify(metadata);\"}"), + JacksonUtil.toJsonNode("{\"layoutX\":824,\"layoutY\":378}")); } - private RuleNode getPushToCloudNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getPushToCloudNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.edge.TbMsgPushToCloudNode", "Push to cloud", - JacksonUtil.OBJECT_MAPPER.readTree("{\"scope\":\"SERVER_SCOPE\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":1129,\"layoutY\":52}")); + JacksonUtil.toJsonNode("{\"scope\":\"SERVER_SCOPE\"}"), + JacksonUtil.toJsonNode("{\"layoutX\":1129,\"layoutY\":52}")); } - private RuleNode getAcknowledgeNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getAcknowledgeNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.flow.TbAckNode", "Acknowledge node", - JacksonUtil.OBJECT_MAPPER.readTree("{\"version\":0}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"description\":\"\",\"layoutX\":177,\"layoutY\":703}")); + JacksonUtil.toJsonNode("{\"version\":0}"), + JacksonUtil.toJsonNode("{\"description\":\"\",\"layoutX\":177,\"layoutY\":703}")); } - private RuleNode getDeviceProfileNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getDeviceProfileNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.profile.TbDeviceProfileNode", "Device Profile Node", - JacksonUtil.OBJECT_MAPPER.readTree("{\"persistAlarmRulesState\":false,\"fetchAlarmRulesStateOnStart\":false}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"description\":\"Process incoming messages from devices with the alarm rules defined in the device profile. Dispatch all incoming messages with \\\"Success\\\" relation type.\",\"layoutX\":187,\"layoutY\":468}")); + JacksonUtil.toJsonNode("{\"persistAlarmRulesState\":false,\"fetchAlarmRulesStateOnStart\":false}"), + JacksonUtil.toJsonNode("{\"description\":\"Process incoming messages from devices with the alarm rules defined in the device profile. Dispatch all incoming messages with \\\"Success\\\" relation type.\",\"layoutX\":187,\"layoutY\":468}")); } - private RuleNode getSaveClientAttributesNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getSaveClientAttributesNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode", "Save Client Attributes", - JacksonUtil.OBJECT_MAPPER.readTree("{\"scope\":\"CLIENT_SCOPE\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":824,\"layoutY\":52}")); + JacksonUtil.toJsonNode("{\"scope\":\"CLIENT_SCOPE\"}"), + JacksonUtil.toJsonNode("{\"layoutX\":824,\"layoutY\":52}")); } - private RuleNode getLogRpcFromDeviceNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getLogRpcFromDeviceNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.action.TbLogNode", "Log RPC from Device", - JacksonUtil.OBJECT_MAPPER.readTree("{\"jsScript\":\"return '\\\\nIncoming message:\\\\n' + JSON.stringify(msg) + '\\\\nIncoming metadata:\\\\n' + JSON.stringify(metadata);\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":825,\"layoutY\":266}")); + JacksonUtil.toJsonNode("{\"jsScript\":\"return '\\\\nIncoming message:\\\\n' + JSON.stringify(msg) + '\\\\nIncoming metadata:\\\\n' + JSON.stringify(metadata);\"}"), + JacksonUtil.toJsonNode("{\"layoutX\":825,\"layoutY\":266}")); } - private RuleNode getRpcCallRequestNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getRpcCallRequestNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode", "RPC Call Request", - JacksonUtil.OBJECT_MAPPER.readTree("{\"timeoutInSeconds\":60}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"layoutX\":824,\"layoutY\":466}")); + JacksonUtil.toJsonNode("{\"timeoutInSeconds\":60}"), + JacksonUtil.toJsonNode("{\"layoutX\":824,\"layoutY\":466}")); } - private RuleNode getPushToAnalyticsNode(RuleChainId ruleChainId) throws JsonProcessingException { + private RuleNode getPushToAnalyticsNode(RuleChainId ruleChainId) { return createRuleNode(ruleChainId, "org.thingsboard.rule.engine.flow.TbRuleChainInputNode", "Push to Analytics", - JacksonUtil.OBJECT_MAPPER.readTree("{\"ruleChainId\":\"af588000-6c7c-11ec-bafd-c9a47a5c8d99\"}"), - JacksonUtil.OBJECT_MAPPER.readTree("{\"description\":\"\",\"layoutX\":477,\"layoutY\":560}")); + JacksonUtil.toJsonNode("{\"ruleChainId\":\"af588000-6c7c-11ec-bafd-c9a47a5c8d99\"}"), + JacksonUtil.toJsonNode("{\"description\":\"\",\"layoutX\":477,\"layoutY\":560}")); } -} \ No newline at end of file +} diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java index 9c45977a7c..835b39caf9 100644 --- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java +++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java @@ -55,6 +55,7 @@ import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.tenant.TenantProfileService; import org.thingsboard.server.dao.tenant.TenantService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.widget.WidgetTypeService; import org.thingsboard.server.dao.widget.WidgetsBundleService; @@ -209,6 +210,9 @@ public abstract class BaseEdgeProcessorTest { @MockBean protected AttributesService attributesService; + @MockBean + protected TimeseriesService timeseriesService; + @MockBean protected TbClusterService tbClusterService; diff --git a/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java b/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java index 9917e837b9..2570b80f9f 100644 --- a/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java @@ -20,6 +20,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.thingsboard.server.cache.limits.DefaultRateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.common.data.TenantProfile; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.NotificationRuleId; @@ -28,9 +30,7 @@ import org.thingsboard.server.common.data.limit.LimitedApi; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.data.tenant.profile.TenantProfileData; import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor; -import org.thingsboard.server.dao.tenant.TbTenantProfileCache; -import org.thingsboard.server.dao.util.limits.DefaultRateLimitService; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.dao.tenant.DefaultTbTenantProfileCache; import java.util.List; import java.util.UUID; @@ -46,12 +46,12 @@ import static org.mockito.Mockito.when; public class RateLimitServiceTest { private RateLimitService rateLimitService; - private TbTenantProfileCache tenantProfileCache; + private DefaultTbTenantProfileCache tenantProfileCache; private TenantId tenantId; @Before public void beforeEach() { - tenantProfileCache = Mockito.mock(TbTenantProfileCache.class); + tenantProfileCache = Mockito.mock(DefaultTbTenantProfileCache.class); rateLimitService = new DefaultRateLimitService(tenantProfileCache, mock(NotificationRuleProcessor.class), 60, 100); tenantId = new TenantId(UUID.randomUUID()); } @@ -69,6 +69,8 @@ public class RateLimitServiceTest { profileConfiguration.setCustomerServerRestLimitsConfiguration(rateLimit); profileConfiguration.setWsUpdatesPerSessionRateLimit(rateLimit); profileConfiguration.setCassandraQueryTenantRateLimitsConfiguration(rateLimit); + profileConfiguration.setEdgeEventRateLimits(rateLimit); + profileConfiguration.setEdgeEventRateLimitsPerEdge(rateLimit); updateTenantProfileConfiguration(profileConfiguration); for (LimitedApi limitedApi : List.of( @@ -76,7 +78,9 @@ public class RateLimitServiceTest { LimitedApi.ENTITY_IMPORT, LimitedApi.NOTIFICATION_REQUESTS, LimitedApi.REST_REQUESTS_PER_CUSTOMER, - LimitedApi.CASSANDRA_QUERIES + LimitedApi.CASSANDRA_QUERIES, + LimitedApi.EDGE_EVENTS, + LimitedApi.EDGE_EVENTS_PER_EDGE )) { testRateLimits(limitedApi, max, tenantId); } diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java index ed4a1c613a..1e95f9add3 100644 --- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java +++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java @@ -93,7 +93,7 @@ import org.thingsboard.server.dao.notification.DefaultNotifications; import org.thingsboard.server.dao.notification.NotificationRequestService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import org.thingsboard.server.queue.notification.DefaultNotificationDeduplicationService; import org.thingsboard.server.service.notification.rule.cache.DefaultNotificationRulesCache; import org.thingsboard.server.service.state.DeviceStateService; diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java index 6efb171fb4..91d4f3ef53 100644 --- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java @@ -41,6 +41,7 @@ import org.thingsboard.server.service.gateway_device.GatewayNotificationsService import org.thingsboard.server.service.profile.TbAssetProfileCache; import org.thingsboard.server.service.profile.TbDeviceProfileCache; +import java.util.List; import java.util.UUID; import static org.mockito.ArgumentMatchers.any; @@ -95,7 +96,7 @@ public class DefaultTbClusterServiceTest { when(producerProvider.getRuleEngineNotificationsMsgProducer()).thenReturn(tbQueueProducer); - clusterService.onQueueChange(createTestQueue()); + clusterService.onQueuesUpdate(List.of(createTestQueue())); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, MONOLITH); verify(topicService, never()).getNotificationsTopic(eq(ServiceType.TB_CORE), any()); @@ -120,7 +121,7 @@ public class DefaultTbClusterServiceTest { when(producerProvider.getRuleEngineNotificationsMsgProducer()).thenReturn(tbQueueProducer); - clusterService.onQueueChange(createTestQueue()); + clusterService.onQueuesUpdate(List.of(createTestQueue())); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, monolith1); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, monolith2); @@ -148,7 +149,7 @@ public class DefaultTbClusterServiceTest { when(producerProvider.getRuleEngineNotificationsMsgProducer()).thenReturn(tbREQueueProducer); when(producerProvider.getTransportNotificationsMsgProducer()).thenReturn(tbTransportQueueProducer); - clusterService.onQueueChange(createTestQueue()); + clusterService.onQueuesUpdate(List.of(createTestQueue())); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, MONOLITH); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_TRANSPORT, TRANSPORT); @@ -194,7 +195,7 @@ public class DefaultTbClusterServiceTest { when(producerProvider.getTbCoreNotificationsMsgProducer()).thenReturn(tbCoreQueueProducer); when(producerProvider.getTransportNotificationsMsgProducer()).thenReturn(tbTransportQueueProducer); - clusterService.onQueueChange(createTestQueue()); + clusterService.onQueuesUpdate(List.of(createTestQueue())); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, monolith1); verify(topicService, times(1)).getNotificationsTopic(ServiceType.TB_RULE_ENGINE, monolith2); diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java new file mode 100644 index 0000000000..621d4c5a91 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java @@ -0,0 +1,532 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.queue; + +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.queue.TbCallback; +import org.thingsboard.server.gen.transport.TransportProtos; +import org.thingsboard.server.service.state.DeviceStateService; + +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.then; +import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.never; + +@ExtendWith(MockitoExtension.class) +public class DefaultTbCoreConsumerServiceTest { + + @Mock + private DeviceStateService stateServiceMock; + @Mock + private TbCoreConsumerStats statsMock; + + @Mock + private TbCallback tbCallbackMock; + + private final TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); + private final DeviceId deviceId = new DeviceId(UUID.randomUUID()); + private final long time = System.currentTimeMillis(); + + private ListeningExecutorService executor; + + @Mock + private DefaultTbCoreConsumerService defaultTbCoreConsumerServiceMock; + + @BeforeEach + public void setup() { + executor = MoreExecutors.newDirectExecutorService(); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stateService", stateServiceMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "deviceActivityEventsExecutor", executor); + } + + @AfterEach + public void cleanup() { + if (executor != null) { + executor.shutdown(); + try { + if (!executor.awaitTermination(10L, TimeUnit.SECONDS)) { + executor.shutdownNow(); + } + } catch (InterruptedException e) { + executor.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + } + + @Test + public void givenProcessingSuccess_whenForwardingDeviceStateMsgToStateService_thenOnSuccessCallbackIsCalled() { + // GIVEN + var stateMsg = TransportProtos.DeviceStateServiceMsgProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setAdded(true) + .setUpdated(false) + .setDeleted(false) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(stateMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(stateMsg, tbCallbackMock); + + // THEN + then(stateServiceMock).should().onQueueMsg(stateMsg, tbCallbackMock); + } + + @Test + public void givenStatsEnabled_whenForwardingDeviceStateMsgToStateService_thenStatsAreRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", true); + + var stateMsg = TransportProtos.DeviceStateServiceMsgProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setAdded(true) + .setUpdated(false) + .setDeleted(false) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(stateMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(stateMsg, tbCallbackMock); + + // THEN + then(statsMock).should().log(stateMsg); + } + + @Test + public void givenStatsDisabled_whenForwardingDeviceStateMsgToStateService_thenStatsAreNotRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", false); + + var stateMsg = TransportProtos.DeviceStateServiceMsgProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setAdded(true) + .setUpdated(false) + .setDeleted(false) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(stateMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(stateMsg, tbCallbackMock); + + // THEN + then(statsMock).should(never()).log(stateMsg); + } + + @Test + public void givenProcessingSuccess_whenForwardingConnectMsgToStateService_thenOnSuccessCallbackIsCalled() { + // GIVEN + var connectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastConnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(connectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(connectMsg, tbCallbackMock); + + // THEN + then(stateServiceMock).should().onDeviceConnect(tenantId, deviceId, time); + then(tbCallbackMock).should().onSuccess(); + then(tbCallbackMock).should(never()).onFailure(any()); + } + + @Test + public void givenProcessingFailure_whenForwardingConnectMsgToStateService_thenOnFailureCallbackIsCalled() { + // GIVEN + var connectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastConnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(connectMsg, tbCallbackMock); + + var runtimeException = new RuntimeException("Something bad happened!"); + doThrow(runtimeException).when(stateServiceMock).onDeviceConnect(tenantId, deviceId, time); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(connectMsg, tbCallbackMock); + + // THEN + then(tbCallbackMock).should(never()).onSuccess(); + then(tbCallbackMock).should().onFailure(runtimeException); + } + + @Test + public void givenStatsEnabled_whenForwardingConnectMsgToStateService_thenStatsAreRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", true); + + var connectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastConnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(connectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(connectMsg, tbCallbackMock); + + // THEN + then(statsMock).should().log(connectMsg); + } + + @Test + public void givenStatsDisabled_whenForwardingConnectMsgToStateService_thenStatsAreNotRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", false); + + var connectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastConnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(connectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(connectMsg, tbCallbackMock); + + // THEN + then(statsMock).should(never()).log(connectMsg); + } + + @Test + public void givenProcessingSuccess_whenForwardingActivityMsgToStateService_thenOnSuccessCallbackIsCalled() { + // GIVEN + var activityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastActivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(activityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(activityMsg, tbCallbackMock); + + // THEN + then(stateServiceMock).should().onDeviceActivity(tenantId, deviceId, time); + then(tbCallbackMock).should().onSuccess(); + then(tbCallbackMock).should(never()).onFailure(any()); + } + + @Test + public void givenProcessingFailure_whenForwardingActivityMsgToStateService_thenOnFailureCallbackIsCalled() { + // GIVEN + var activityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastActivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(activityMsg, tbCallbackMock); + + var runtimeException = new RuntimeException("Something bad happened!"); + doThrow(runtimeException).when(stateServiceMock).onDeviceActivity(tenantId, deviceId, time); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(activityMsg, tbCallbackMock); + + // THEN + then(tbCallbackMock).should(never()).onSuccess(); + + var exceptionCaptor = ArgumentCaptor.forClass(Throwable.class); + then(tbCallbackMock).should().onFailure(exceptionCaptor.capture()); + assertThat(exceptionCaptor.getValue()) + .isInstanceOf(RuntimeException.class) + .hasMessage("Failed to update device activity for device [" + deviceId.getId() + "]!") + .hasCause(runtimeException); + } + + @Test + public void givenStatsEnabled_whenForwardingActivityMsgToStateService_thenStatsAreRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", true); + + var activityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastActivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(activityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(activityMsg, tbCallbackMock); + + // THEN + then(statsMock).should().log(activityMsg); + } + + @Test + public void givenStatsDisabled_whenForwardingActivityMsgToStateService_thenStatsAreNotRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", false); + + var activityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastActivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(activityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(activityMsg, tbCallbackMock); + + // THEN + then(statsMock).should(never()).log(activityMsg); + } + + @Test + public void givenProcessingSuccess_whenForwardingDisconnectMsgToStateService_thenOnSuccessCallbackIsCalled() { + // GIVEN + var disconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastDisconnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(disconnectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(disconnectMsg, tbCallbackMock); + + // THEN + then(stateServiceMock).should().onDeviceDisconnect(tenantId, deviceId, time); + then(tbCallbackMock).should().onSuccess(); + then(tbCallbackMock).should(never()).onFailure(any()); + } + + @Test + public void givenProcessingFailure_whenForwardingDisconnectMsgToStateService_thenOnFailureCallbackIsCalled() { + // GIVEN + var disconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastDisconnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(disconnectMsg, tbCallbackMock); + + var runtimeException = new RuntimeException("Something bad happened!"); + doThrow(runtimeException).when(stateServiceMock).onDeviceDisconnect(tenantId, deviceId, time); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(disconnectMsg, tbCallbackMock); + + // THEN + then(tbCallbackMock).should(never()).onSuccess(); + then(tbCallbackMock).should().onFailure(runtimeException); + } + + @Test + public void givenStatsEnabled_whenForwardingDisconnectMsgToStateService_thenStatsAreRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", true); + + var disconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastDisconnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(disconnectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(disconnectMsg, tbCallbackMock); + + // THEN + then(statsMock).should().log(disconnectMsg); + } + + @Test + public void givenStatsDisabled_whenForwardingDisconnectMsgToStateService_thenStatsAreNotRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", false); + + var disconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastDisconnectTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(disconnectMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(disconnectMsg, tbCallbackMock); + + // THEN + then(statsMock).should(never()).log(disconnectMsg); + } + + @Test + public void givenProcessingSuccess_whenForwardingInactivityMsgToStateService_thenOnSuccessCallbackIsCalled() { + // GIVEN + var inactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastInactivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(inactivityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(inactivityMsg, tbCallbackMock); + + // THEN + then(stateServiceMock).should().onDeviceInactivity(tenantId, deviceId, time); + then(tbCallbackMock).should().onSuccess(); + then(tbCallbackMock).should(never()).onFailure(any()); + } + + @Test + public void givenProcessingFailure_whenForwardingInactivityMsgToStateService_thenOnFailureCallbackIsCalled() { + // GIVEN + var inactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastInactivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(inactivityMsg, tbCallbackMock); + + var runtimeException = new RuntimeException("Something bad happened!"); + doThrow(runtimeException).when(stateServiceMock).onDeviceInactivity(tenantId, deviceId, time); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(inactivityMsg, tbCallbackMock); + + // THEN + then(tbCallbackMock).should(never()).onSuccess(); + then(tbCallbackMock).should().onFailure(runtimeException); + } + + @Test + public void givenStatsEnabled_whenForwardingInactivityMsgToStateService_thenStatsAreRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", true); + + var inactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastInactivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(inactivityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(inactivityMsg, tbCallbackMock); + + // THEN + then(statsMock).should().log(inactivityMsg); + } + + @Test + public void givenStatsDisabled_whenForwardingInactivityMsgToStateService_thenStatsAreNotRecorded() { + // GIVEN + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "stats", statsMock); + ReflectionTestUtils.setField(defaultTbCoreConsumerServiceMock, "statsEnabled", false); + + var inactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(tenantId.getId().getMostSignificantBits()) + .setTenantIdLSB(tenantId.getId().getLeastSignificantBits()) + .setDeviceIdMSB(deviceId.getId().getMostSignificantBits()) + .setDeviceIdLSB(deviceId.getId().getLeastSignificantBits()) + .setLastInactivityTime(time) + .build(); + + doCallRealMethod().when(defaultTbCoreConsumerServiceMock).forwardToStateService(inactivityMsg, tbCallbackMock); + + // WHEN + defaultTbCoreConsumerServiceMock.forwardToStateService(inactivityMsg, tbCallbackMock); + + // THEN + then(statsMock).should(never()).log(inactivityMsg); + } + +} diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java index 83c1f138f2..8db79a8553 100644 --- a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java @@ -21,11 +21,13 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.util.ReflectionTestUtils; import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.DeviceIdInfo; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; @@ -54,19 +56,26 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE; @@ -74,6 +83,8 @@ import static org.thingsboard.server.service.state.DefaultDeviceStateService.ACT import static org.thingsboard.server.service.state.DefaultDeviceStateService.INACTIVITY_ALARM_TIME; import static org.thingsboard.server.service.state.DefaultDeviceStateService.INACTIVITY_TIMEOUT; import static org.thingsboard.server.service.state.DefaultDeviceStateService.LAST_ACTIVITY_TIME; +import static org.thingsboard.server.service.state.DefaultDeviceStateService.LAST_CONNECT_TIME; +import static org.thingsboard.server.service.state.DefaultDeviceStateService.LAST_DISCONNECT_TIME; @ExtendWith(MockitoExtension.class) public class DefaultDeviceStateServiceTest { @@ -116,21 +127,366 @@ public class DefaultDeviceStateServiceTest { tpi = TopicPartitionInfo.builder().myPartition(true).build(); } + @Test + public void givenDeviceBelongsToExternalPartition_whenOnDeviceConnect_thenCleansStateAndDoesNotReportConnect() { + // GIVEN + doReturn(true).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceConnect(tenantId, deviceId, System.currentTimeMillis()); + + // THEN + then(service).should().cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + then(service).should(never()).getOrFetchDeviceStateData(deviceId); + then(service).should(never()).checkAndUpdateState(eq(deviceId), any()); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @ValueSource(longs = {Long.MIN_VALUE, -100, -1}) + public void givenNegativeLastConnectTime_whenOnDeviceConnect_thenSkipsThisEvent(long negativeLastConnectTime) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceConnect(tenantId, deviceId, negativeLastConnectTime); + + // THEN + then(service).should(never()).getOrFetchDeviceStateData(deviceId); + then(service).should(never()).checkAndUpdateState(eq(deviceId), any()); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @MethodSource("provideOutdatedTimestamps") + public void givenOutdatedLastConnectTime_whenOnDeviceDisconnect_thenSkipsThisEvent(long outdatedLastConnectTime, long currentLastConnectTime) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().lastConnectTime(currentLastConnectTime).build()) + .build(); + service.deviceStates.put(deviceId, deviceStateData); + + // WHEN + service.onDeviceConnect(tenantId, deviceId, outdatedLastConnectTime); + + // THEN + then(service).should(never()).checkAndUpdateState(eq(deviceId), any()); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @Test + public void givenDeviceBelongsToMyPartition_whenOnDeviceConnect_thenReportsConnect() { + // GIVEN + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().build()) + .metaData(new TbMsgMetaData()) + .build(); + + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + service.deviceStates.put(deviceId, deviceStateData); + long lastConnectTime = System.currentTimeMillis(); + + // WHEN + service.onDeviceConnect(tenantId, deviceId, lastConnectTime); + + // THEN + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), eq(LAST_CONNECT_TIME), eq(lastConnectTime), any() + ); + + var msgCaptor = ArgumentCaptor.forClass(TbMsg.class); + then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any()); + var actualMsg = msgCaptor.getValue(); + assertThat(actualMsg.getType()).isEqualTo(TbMsgType.CONNECT_EVENT.name()); + assertThat(actualMsg.getOriginator()).isEqualTo(deviceId); + } + + @Test + public void givenDeviceBelongsToExternalPartition_whenOnDeviceDisconnect_thenCleansStateAndDoesNotReportDisconnect() { + // GIVEN + doReturn(true).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceDisconnect(tenantId, deviceId, System.currentTimeMillis()); + + // THEN + then(service).should().cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + then(service).should(never()).getOrFetchDeviceStateData(deviceId); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @ValueSource(longs = {Long.MIN_VALUE, -100, -1}) + public void givenNegativeLastDisconnectTime_whenOnDeviceDisconnect_thenSkipsThisEvent(long negativeLastDisconnectTime) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceDisconnect(tenantId, deviceId, negativeLastDisconnectTime); + + // THEN + then(service).should(never()).getOrFetchDeviceStateData(deviceId); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @MethodSource("provideOutdatedTimestamps") + public void givenOutdatedLastDisconnectTime_whenOnDeviceDisconnect_thenSkipsThisEvent(long outdatedLastDisconnectTime, long currentLastDisconnectTime) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().lastDisconnectTime(currentLastDisconnectTime).build()) + .build(); + service.deviceStates.put(deviceId, deviceStateData); + + // WHEN + service.onDeviceDisconnect(tenantId, deviceId, outdatedLastDisconnectTime); + + // THEN + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @Test + public void givenDeviceBelongsToMyPartition_whenOnDeviceDisconnect_thenReportsDisconnect() { + // GIVEN + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().build()) + .metaData(new TbMsgMetaData()) + .build(); + + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + service.deviceStates.put(deviceId, deviceStateData); + long lastDisconnectTime = System.currentTimeMillis(); + + // WHEN + service.onDeviceDisconnect(tenantId, deviceId, lastDisconnectTime); + + // THEN + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), + eq(LAST_DISCONNECT_TIME), eq(lastDisconnectTime), any() + ); + + var msgCaptor = ArgumentCaptor.forClass(TbMsg.class); + then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any()); + var actualMsg = msgCaptor.getValue(); + assertThat(actualMsg.getType()).isEqualTo(TbMsgType.DISCONNECT_EVENT.name()); + assertThat(actualMsg.getOriginator()).isEqualTo(deviceId); + } + + @Test + public void givenDeviceBelongsToExternalPartition_whenOnDeviceInactivity_thenCleansStateAndDoesNotReportInactivity() { + // GIVEN + doReturn(true).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceInactivity(tenantId, deviceId, System.currentTimeMillis()); + + // THEN + then(service).should().cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + then(service).should(never()).fetchDeviceStateDataUsingSeparateRequests(deviceId); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @ValueSource(longs = {Long.MIN_VALUE, -100, -1}) + public void givenNegativeLastInactivityTime_whenOnDeviceInactivity_thenSkipsThisEvent(long negativeLastInactivityTime) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + // WHEN + service.onDeviceInactivity(tenantId, deviceId, negativeLastInactivityTime); + + // THEN + then(service).should(never()).getOrFetchDeviceStateData(deviceId); + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @MethodSource("provideOutdatedTimestamps") + public void givenReceivedInactivityTimeIsLessThanOrEqualToCurrentInactivityTime_whenOnDeviceInactivity_thenSkipsThisEvent( + long outdatedLastInactivityTime, long currentLastInactivityTime + ) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().lastInactivityAlarmTime(currentLastInactivityTime).build()) + .build(); + service.deviceStates.put(deviceId, deviceStateData); + + // WHEN + service.onDeviceInactivity(tenantId, deviceId, outdatedLastInactivityTime); + + // THEN + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + @ParameterizedTest + @MethodSource("provideOutdatedTimestamps") + public void givenReceivedInactivityTimeIsLessThanOrEqualToCurrentActivityTime_whenOnDeviceInactivity_thenSkipsThisEvent( + long outdatedLastInactivityTime, long currentLastActivityTime + ) { + // GIVEN + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().lastActivityTime(currentLastActivityTime).build()) + .build(); + service.deviceStates.put(deviceId, deviceStateData); + + // WHEN + service.onDeviceInactivity(tenantId, deviceId, outdatedLastInactivityTime); + + // THEN + then(clusterService).shouldHaveNoInteractions(); + then(notificationRuleProcessor).shouldHaveNoInteractions(); + then(telemetrySubscriptionService).shouldHaveNoInteractions(); + } + + private static Stream provideOutdatedTimestamps() { + return Stream.of( + Arguments.of(0, 0), + Arguments.of(0, 100), + Arguments.of(50, 100), + Arguments.of(99, 100), + Arguments.of(100, 100) + ); + } + + @Test + public void givenDeviceBelongsToMyPartition_whenOnDeviceInactivity_thenReportsInactivity() { + // GIVEN + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().build()) + .metaData(new TbMsgMetaData()) + .build(); + + doReturn(false).when(service).cleanDeviceStateIfBelongsToExternalPartition(tenantId, deviceId); + + service.deviceStates.put(deviceId, deviceStateData); + long lastInactivityTime = System.currentTimeMillis(); + + // WHEN + service.onDeviceInactivity(tenantId, deviceId, lastInactivityTime); + + // THEN + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), + eq(INACTIVITY_ALARM_TIME), eq(lastInactivityTime), any() + ); + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), + eq(ACTIVITY_STATE), eq(false), any() + ); + + var msgCaptor = ArgumentCaptor.forClass(TbMsg.class); + then(clusterService).should() + .pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any()); + var actualMsg = msgCaptor.getValue(); + assertThat(actualMsg.getType()).isEqualTo(TbMsgType.INACTIVITY_EVENT.name()); + assertThat(actualMsg.getOriginator()).isEqualTo(deviceId); + + var notificationCaptor = ArgumentCaptor.forClass(DeviceActivityTrigger.class); + then(notificationRuleProcessor).should().process(notificationCaptor.capture()); + var actualNotification = notificationCaptor.getValue(); + assertThat(actualNotification.getTenantId()).isEqualTo(tenantId); + assertThat(actualNotification.getDeviceId()).isEqualTo(deviceId); + assertThat(actualNotification.isActive()).isFalse(); + } + + @Test + public void givenInactivityTimeoutReached_whenUpdateInactivityStateIfExpired_thenReportsInactivity() { + // GIVEN + var deviceStateData = DeviceStateData.builder() + .tenantId(tenantId) + .deviceId(deviceId) + .state(DeviceState.builder().build()) + .metaData(new TbMsgMetaData()) + .build(); + + given(partitionService.resolve(ServiceType.TB_CORE, tenantId, deviceId)).willReturn(tpi); + + // WHEN + service.updateInactivityStateIfExpired(System.currentTimeMillis(), deviceId, deviceStateData); + + // THEN + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), + eq(INACTIVITY_ALARM_TIME), anyLong(), any() + ); + then(telemetrySubscriptionService).should().saveAttrAndNotify( + eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), + eq(ACTIVITY_STATE), eq(false), any() + ); + + var msgCaptor = ArgumentCaptor.forClass(TbMsg.class); + then(clusterService).should() + .pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any()); + var actualMsg = msgCaptor.getValue(); + assertThat(actualMsg.getType()).isEqualTo(TbMsgType.INACTIVITY_EVENT.name()); + assertThat(actualMsg.getOriginator()).isEqualTo(deviceId); + + var notificationCaptor = ArgumentCaptor.forClass(DeviceActivityTrigger.class); + then(notificationRuleProcessor).should().process(notificationCaptor.capture()); + var actualNotification = notificationCaptor.getValue(); + assertThat(actualNotification.getTenantId()).isEqualTo(tenantId); + assertThat(actualNotification.getDeviceId()).isEqualTo(deviceId); + assertThat(actualNotification.isActive()).isFalse(); + } + @Test public void givenDeviceIdFromDeviceStatesMap_whenGetOrFetchDeviceStateData_thenNoStackOverflow() { service.deviceStates.put(deviceId, deviceStateDataMock); DeviceStateData deviceStateData = service.getOrFetchDeviceStateData(deviceId); assertThat(deviceStateData).isEqualTo(deviceStateDataMock); - verify(service, never()).fetchDeviceStateDataUsingEntityDataQuery(deviceId); + verify(service, never()).fetchDeviceStateDataUsingSeparateRequests(deviceId); } @Test public void givenDeviceIdWithoutDeviceStateInMap_whenGetOrFetchDeviceStateData_thenFetchDeviceStateData() { service.deviceStates.clear(); - willReturn(deviceStateDataMock).given(service).fetchDeviceStateDataUsingEntityDataQuery(deviceId); + willReturn(deviceStateDataMock).given(service).fetchDeviceStateDataUsingSeparateRequests(deviceId); DeviceStateData deviceStateData = service.getOrFetchDeviceStateData(deviceId); assertThat(deviceStateData).isEqualTo(deviceStateDataMock); - verify(service, times(1)).fetchDeviceStateDataUsingEntityDataQuery(deviceId); + verify(service).fetchDeviceStateDataUsingSeparateRequests(deviceId); } @Test @@ -356,7 +712,7 @@ public class DefaultDeviceStateServiceTest { } private void activityVerify(boolean isActive) { - verify(telemetrySubscriptionService, times(1)).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), eq(isActive), any()); + verify(telemetrySubscriptionService).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), eq(isActive), any()); } @Test @@ -435,28 +791,28 @@ public class DefaultDeviceStateServiceTest { private static Stream provideParametersForUpdateActivityState() { return Stream.of( - Arguments.of(true, 100, 120, 80, 80, false, false), + Arguments.of(true, 100, 120, 80, 80, false, false), - Arguments.of(true, 100, 120, 100, 100, false, false), + Arguments.of(true, 100, 120, 100, 100, false, false), Arguments.of(false, 100, 120, 110, 110, false, true), - Arguments.of(true, 100, 100, 80, 80, false, false), + Arguments.of(true, 100, 100, 80, 80, false, false), - Arguments.of(true, 100, 100, 100, 100, false, false), + Arguments.of(true, 100, 100, 100, 100, false, false), - Arguments.of(false, 100, 100, 110, 0, true, true), + Arguments.of(false, 100, 100, 110, 0, true, true), - Arguments.of(false, 100, 110, 110, 0, true, true), + Arguments.of(false, 100, 110, 110, 0, true, true), - Arguments.of(false, 100, 110, 120, 0, true, true), + Arguments.of(false, 100, 110, 120, 0, true, true), - Arguments.of(true, 0, 0, 0, 0, false, false), + Arguments.of(true, 0, 0, 0, 0, false, false), - Arguments.of(false, 0, 0, 0, 0, true, true) + Arguments.of(false, 0, 0, 0, 0, true, true) ); } @@ -679,4 +1035,40 @@ public class DefaultDeviceStateServiceTest { ); } + @Test + public void givenConcurrentAccess_whenGetOrFetchDeviceStateData_thenFetchDeviceStateDataInvokedOnce() { + doAnswer(invocation -> { + Thread.sleep(100); + return deviceStateDataMock; + }).when(service).fetchDeviceStateDataUsingSeparateRequests(deviceId); + + int numberOfThreads = 10; + var allThreadsReadyLatch = new CountDownLatch(numberOfThreads); + + ExecutorService executor = null; + try { + executor = Executors.newFixedThreadPool(numberOfThreads); + for (int i = 0; i < numberOfThreads; i++) { + executor.submit(() -> { + allThreadsReadyLatch.countDown(); + try { + allThreadsReadyLatch.await(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + service.getOrFetchDeviceStateData(deviceId); + }); + } + + executor.shutdown(); + await().atMost(10, TimeUnit.SECONDS).until(executor::isTerminated); + } finally { + if (executor != null) { + executor.shutdownNow(); + } + } + + then(service).should().fetchDeviceStateDataUsingSeparateRequests(deviceId); + } + } diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java new file mode 100644 index 0000000000..c97305c170 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java @@ -0,0 +1,266 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.state; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.server.cluster.TbClusterService; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.queue.ServiceType; +import org.thingsboard.server.common.msg.queue.TbCallback; +import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; +import org.thingsboard.server.gen.transport.TransportProtos; +import org.thingsboard.server.queue.TbQueueCallback; +import org.thingsboard.server.queue.TbQueueMsgMetadata; +import org.thingsboard.server.queue.discovery.PartitionService; +import org.thingsboard.server.queue.discovery.TbServiceInfoProvider; + +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.then; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.never; + +@ExtendWith(MockitoExtension.class) +public class DefaultRuleEngineDeviceStateManagerTest { + + @Mock + private static DeviceStateService deviceStateServiceMock; + @Mock + private static TbCallback tbCallbackMock; + @Mock + private static TbClusterService clusterServiceMock; + @Mock + private static TbQueueMsgMetadata metadataMock; + + @Mock + private TbServiceInfoProvider serviceInfoProviderMock; + @Mock + private PartitionService partitionServiceMock; + + @Captor + private static ArgumentCaptor queueCallbackCaptor; + + private static DefaultRuleEngineDeviceStateManager deviceStateManager; + + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("57ab2e6c-bc4c-11ee-a506-0242ac120002")); + private static final DeviceId DEVICE_ID = DeviceId.fromString("74a9053e-bc4c-11ee-a506-0242ac120002"); + private static final long EVENT_TS = System.currentTimeMillis(); + private static final RuntimeException RUNTIME_EXCEPTION = new RuntimeException("Something bad happened!"); + private static final TopicPartitionInfo MY_TPI = TopicPartitionInfo.builder().myPartition(true).build(); + private static final TopicPartitionInfo EXTERNAL_TPI = TopicPartitionInfo.builder().myPartition(false).build(); + + @BeforeEach + public void setup() { + deviceStateManager = new DefaultRuleEngineDeviceStateManager(serviceInfoProviderMock, partitionServiceMock, Optional.of(deviceStateServiceMock), clusterServiceMock); + } + + @ParameterizedTest + @DisplayName("Given event should be routed to local service and event processed has succeeded, " + + "when onDeviceX() is called, then should route event to local service and call onSuccess() callback.") + @MethodSource + public void givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback(Runnable onDeviceAction, Runnable actionVerification) { + // GIVEN + given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true); + given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI); + + onDeviceAction.run(); + + // THEN + actionVerification.run(); + + then(clusterServiceMock).shouldHaveNoInteractions(); + then(tbCallbackMock).should().onSuccess(); + then(tbCallbackMock).should(never()).onFailure(any()); + } + + private static Stream givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback() { + return Stream.of( + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS) + ) + ); + } + + @ParameterizedTest + @DisplayName("Given event should be routed to local service and event processed has failed, " + + "when onDeviceX() is called, then should route event to local service and call onFailure() callback.") + @MethodSource + public void givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback( + Runnable exceptionThrowSetup, Runnable onDeviceAction, Runnable actionVerification + ) { + // GIVEN + given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true); + given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI); + + exceptionThrowSetup.run(); + + // WHEN + onDeviceAction.run(); + + // THEN + actionVerification.run(); + + then(clusterServiceMock).shouldHaveNoInteractions(); + then(tbCallbackMock).should(never()).onSuccess(); + then(tbCallbackMock).should().onFailure(RUNTIME_EXCEPTION); + } + + private static Stream givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback() { + return Stream.of( + Arguments.of( + (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS), + (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS), + (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS), + (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS) + ), + Arguments.of( + (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS), + (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS) + ) + ); + } + + @ParameterizedTest + @DisplayName("Given event should be routed to external service, " + + "when onDeviceX() is called, then should send correct queue message to external service with correct callback object.") + @MethodSource + public void givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback(Runnable onDeviceAction, Runnable actionVerification) { + // WHEN + ReflectionTestUtils.setField(deviceStateManager, "deviceStateService", Optional.empty()); + given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(false); + given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(EXTERNAL_TPI); + + onDeviceAction.run(); + + // THEN + actionVerification.run(); + + TbQueueCallback callback = queueCallbackCaptor.getValue(); + callback.onSuccess(metadataMock); + then(tbCallbackMock).should().onSuccess(); + callback.onFailure(RUNTIME_EXCEPTION); + then(tbCallbackMock).should().onFailure(RUNTIME_EXCEPTION); + } + + private static Stream givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback() { + return Stream.of( + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> { + var deviceConnectMsg = TransportProtos.DeviceConnectProto.newBuilder() + .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits()) + .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits()) + .setDeviceIdMSB(DEVICE_ID.getId().getMostSignificantBits()) + .setDeviceIdLSB(DEVICE_ID.getId().getLeastSignificantBits()) + .setLastConnectTime(EVENT_TS) + .build(); + var toCoreMsg = TransportProtos.ToCoreMsg.newBuilder() + .setDeviceConnectMsg(deviceConnectMsg) + .build(); + then(clusterServiceMock).should().pushMsgToCore(eq(EXTERNAL_TPI), any(UUID.class), eq(toCoreMsg), queueCallbackCaptor.capture()); + } + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> { + var deviceActivityMsg = TransportProtos.DeviceActivityProto.newBuilder() + .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits()) + .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits()) + .setDeviceIdMSB(DEVICE_ID.getId().getMostSignificantBits()) + .setDeviceIdLSB(DEVICE_ID.getId().getLeastSignificantBits()) + .setLastActivityTime(EVENT_TS) + .build(); + var toCoreMsg = TransportProtos.ToCoreMsg.newBuilder() + .setDeviceActivityMsg(deviceActivityMsg) + .build(); + then(clusterServiceMock).should().pushMsgToCore(eq(EXTERNAL_TPI), any(UUID.class), eq(toCoreMsg), queueCallbackCaptor.capture()); + } + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> { + var deviceDisconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder() + .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits()) + .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits()) + .setDeviceIdMSB(DEVICE_ID.getId().getMostSignificantBits()) + .setDeviceIdLSB(DEVICE_ID.getId().getLeastSignificantBits()) + .setLastDisconnectTime(EVENT_TS) + .build(); + var toCoreMsg = TransportProtos.ToCoreMsg.newBuilder() + .setDeviceDisconnectMsg(deviceDisconnectMsg) + .build(); + then(clusterServiceMock).should().pushMsgToCore(eq(EXTERNAL_TPI), any(UUID.class), eq(toCoreMsg), queueCallbackCaptor.capture()); + } + ), + Arguments.of( + (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock), + (Runnable) () -> { + var deviceInactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder() + .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits()) + .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits()) + .setDeviceIdMSB(DEVICE_ID.getId().getMostSignificantBits()) + .setDeviceIdLSB(DEVICE_ID.getId().getLeastSignificantBits()) + .setLastInactivityTime(EVENT_TS) + .build(); + var toCoreMsg = TransportProtos.ToCoreMsg.newBuilder() + .setDeviceInactivityMsg(deviceInactivityMsg) + .build(); + then(clusterServiceMock).should().pushMsgToCore(eq(EXTERNAL_TPI), any(UUID.class), eq(toCoreMsg), queueCallbackCaptor.capture()); + } + ) + ); + } + +} diff --git a/common/cache/pom.xml b/common/cache/pom.xml index 6b9544e761..184aa615ba 100644 --- a/common/cache/pom.xml +++ b/common/cache/pom.xml @@ -40,6 +40,10 @@ org.thingsboard.common data + + org.thingsboard.common + message + org.springframework.boot spring-boot-autoconfigure diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/limits/DefaultRateLimitService.java b/common/cache/src/main/java/org/thingsboard/server/cache/limits/DefaultRateLimitService.java similarity index 92% rename from dao/src/main/java/org/thingsboard/server/dao/util/limits/DefaultRateLimitService.java rename to common/cache/src/main/java/org/thingsboard/server/cache/limits/DefaultRateLimitService.java index bcd560a6f9..f3530e99d2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/limits/DefaultRateLimitService.java +++ b/common/cache/src/main/java/org/thingsboard/server/cache/limits/DefaultRateLimitService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.util.limits; +package org.thingsboard.server.cache.limits; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @@ -28,25 +28,25 @@ import org.thingsboard.server.common.data.exception.TenantProfileNotFoundExcepti import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.limit.LimitedApi; -import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor; import org.thingsboard.server.common.data.notification.rule.trigger.RateLimitsTrigger; +import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor; import org.thingsboard.server.common.msg.tools.TbRateLimits; -import org.thingsboard.server.dao.tenant.TbTenantProfileCache; import java.util.concurrent.TimeUnit; +@Lazy @Service @Slf4j public class DefaultRateLimitService implements RateLimitService { - private final TbTenantProfileCache tenantProfileCache; + private final TenantProfileProvider tenantProfileProvider; private final NotificationRuleProcessor notificationRuleProcessor; - public DefaultRateLimitService(TbTenantProfileCache tenantProfileCache, + public DefaultRateLimitService(TenantProfileProvider tenantProfileProvider, @Lazy NotificationRuleProcessor notificationRuleProcessor, @Value("${cache.rateLimits.timeToLiveInMinutes:120}") int rateLimitsTtl, @Value("${cache.rateLimits.maxSize:200000}") int rateLimitsCacheMaxSize) { - this.tenantProfileCache = tenantProfileCache; + this.tenantProfileProvider = tenantProfileProvider; this.notificationRuleProcessor = notificationRuleProcessor; this.rateLimits = Caffeine.newBuilder() .expireAfterAccess(rateLimitsTtl, TimeUnit.MINUTES) @@ -66,7 +66,7 @@ public class DefaultRateLimitService implements RateLimitService { if (tenantId.isSysTenantId()) { return true; } - TenantProfile tenantProfile = tenantProfileCache.get(tenantId); + TenantProfile tenantProfile = tenantProfileProvider.get(tenantId); if (tenantProfile == null) { throw new TenantProfileNotFoundException(tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/limits/RateLimitService.java b/common/cache/src/main/java/org/thingsboard/server/cache/limits/RateLimitService.java similarity index 95% rename from dao/src/main/java/org/thingsboard/server/dao/util/limits/RateLimitService.java rename to common/cache/src/main/java/org/thingsboard/server/cache/limits/RateLimitService.java index e24383bb62..84c22c514b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/limits/RateLimitService.java +++ b/common/cache/src/main/java/org/thingsboard/server/cache/limits/RateLimitService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.util.limits; +package org.thingsboard.server.cache.limits; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.limit.LimitedApi; diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/limits/TenantProfileProvider.java b/common/cache/src/main/java/org/thingsboard/server/cache/limits/TenantProfileProvider.java new file mode 100644 index 0000000000..15243d12c8 --- /dev/null +++ b/common/cache/src/main/java/org/thingsboard/server/cache/limits/TenantProfileProvider.java @@ -0,0 +1,25 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.cache.limits; + +import org.thingsboard.server.common.data.TenantProfile; +import org.thingsboard.server.common.data.id.TenantId; + +public interface TenantProfileProvider { + + TenantProfile get(TenantId tenantId); + +} diff --git a/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueClusterService.java b/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueClusterService.java index a4502da4b1..11b60c86bd 100644 --- a/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueClusterService.java +++ b/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueClusterService.java @@ -17,8 +17,12 @@ package org.thingsboard.server.queue; import org.thingsboard.server.common.data.queue.Queue; +import java.util.List; + public interface TbQueueClusterService { - void onQueueChange(Queue queue); - void onQueueDelete(Queue queue); + void onQueuesUpdate(List queues); + + void onQueuesDelete(List queues); + } diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java index 15e55d8713..d6d5551ccf 100644 --- a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java @@ -91,4 +91,6 @@ public interface EdgeService extends EntityDaoService { PageData findRelatedEdgeIdsByEntityId(TenantId tenantId, EntityId entityId, PageLink pageLink); String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId, String tbRuleChainInputNodeClassName); + + ListenableFuture isEdgeActiveAsync(TenantId tenantId, EdgeId edgeId, String activityState); } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java index 5f743f626a..980eb880a0 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java @@ -31,6 +31,8 @@ public enum LimitedApi { REST_REQUESTS_PER_CUSTOMER(DefaultTenantProfileConfiguration::getCustomerServerRestLimitsConfiguration, "REST API requests per customer", false), WS_UPDATES_PER_SESSION(DefaultTenantProfileConfiguration::getWsUpdatesPerSessionRateLimit, "WS updates per session", true), CASSANDRA_QUERIES(DefaultTenantProfileConfiguration::getCassandraQueryTenantRateLimitsConfiguration, "Cassandra queries", true), + EDGE_EVENTS(DefaultTenantProfileConfiguration::getEdgeEventRateLimits, "Edge events", true), + EDGE_EVENTS_PER_EDGE(DefaultTenantProfileConfiguration::getEdgeEventRateLimitsPerEdge, "Edge events per edge", false), PASSWORD_RESET(false, true), TWO_FA_VERIFICATION_CODE_SEND(false, true), TWO_FA_VERIFICATION_CODE_CHECK(false, true), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java index 8eb4451e3b..cfc91d8fca 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java @@ -28,6 +28,7 @@ public enum NotificationType { ENTITIES_LIMIT, API_USAGE_LIMIT, RULE_NODE, - RATE_LIMITS - + RATE_LIMITS, + EDGE_CONNECTION, + EDGE_COMMUNICATION_FAILURE } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeCommunicationFailureNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeCommunicationFailureNotificationInfo.java new file mode 100644 index 0000000000..6d0f2ae5f5 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeCommunicationFailureNotificationInfo.java @@ -0,0 +1,66 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.info; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.Map; + +import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EdgeCommunicationFailureNotificationInfo implements RuleOriginatedNotificationInfo { + + private TenantId tenantId; + private CustomerId customerId; + private EdgeId edgeId; + private String edgeName; + private String failureMsg; + + @Override + public Map getTemplateData() { + return mapOf( + "edgeId", edgeId.toString(), + "edgeName", edgeName, + "failureMsg", failureMsg + ); + } + + @Override + public TenantId getAffectedTenantId() { + return tenantId; + } + + @Override + public CustomerId getAffectedCustomerId() { + return customerId; + } + + @Override + public EntityId getStateEntityId() { + return edgeId; + } +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeConnectionNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeConnectionNotificationInfo.java new file mode 100644 index 0000000000..62b1370566 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EdgeConnectionNotificationInfo.java @@ -0,0 +1,66 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.info; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.Map; + +import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EdgeConnectionNotificationInfo implements RuleOriginatedNotificationInfo { + + private String eventType; + private TenantId tenantId; + private CustomerId customerId; + private EdgeId edgeId; + private String edgeName; + + @Override + public Map getTemplateData() { + return mapOf( + "eventType", eventType, + "edgeId", edgeId.toString(), + "edgeName", edgeName + ); + } + + @Override + public TenantId getAffectedTenantId() { + return tenantId; + } + + @Override + public CustomerId getAffectedCustomerId() { + return customerId; + } + + @Override + public EntityId getStateEntityId() { + return edgeId; + } +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeCommunicationFailureTrigger.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeCommunicationFailureTrigger.java new file mode 100644 index 0000000000..6212c22a0d --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeCommunicationFailureTrigger.java @@ -0,0 +1,63 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.rule.trigger; + +import lombok.Builder; +import lombok.Data; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType; + +import java.util.concurrent.TimeUnit; + +@Data +@Builder +public class EdgeCommunicationFailureTrigger implements NotificationRuleTrigger { + + private final TenantId tenantId; + private final CustomerId customerId; + private final EdgeId edgeId; + private final String edgeName; + private final String failureMsg; + private final String error; + + @Override + public boolean deduplicate() { + return true; + } + + @Override + public String getDeduplicationKey() { + return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), error); + } + + @Override + public long getDefaultDeduplicationDuration() { + return TimeUnit.MINUTES.toMillis(30); + } + + @Override + public NotificationRuleTriggerType getType() { + return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE; + } + + @Override + public EntityId getOriginatorEntityId() { + return edgeId; + } +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeConnectionTrigger.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeConnectionTrigger.java new file mode 100644 index 0000000000..766338dba6 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/EdgeConnectionTrigger.java @@ -0,0 +1,62 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.rule.trigger; + +import lombok.Builder; +import lombok.Data; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EdgeId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType; + +import java.util.concurrent.TimeUnit; + +@Data +@Builder +public class EdgeConnectionTrigger implements NotificationRuleTrigger { + + private final TenantId tenantId; + private final CustomerId customerId; + private final EdgeId edgeId; + private final boolean connected; + private final String edgeName; + + @Override + public boolean deduplicate() { + return true; + } + + @Override + public String getDeduplicationKey() { + return String.join(":", NotificationRuleTrigger.super.getDeduplicationKey(), String.valueOf(connected)); + } + + @Override + public long getDefaultDeduplicationDuration() { + return TimeUnit.MINUTES.toMillis(1); + } + + @Override + public NotificationRuleTriggerType getType() { + return NotificationRuleTriggerType.EDGE_CONNECTION; + } + + @Override + public EntityId getOriginatorEntityId() { + return edgeId; + } +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java new file mode 100644 index 0000000000..595b0fa7d5 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.rule.trigger.config; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Set; +import java.util.UUID; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EdgeCommunicationFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig { + + private Set edges; // if empty - all edges + + @Override + public NotificationRuleTriggerType getTriggerType() { + return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE; + } + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java new file mode 100644 index 0000000000..8c0905cc59 --- /dev/null +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java @@ -0,0 +1,44 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.data.notification.rule.trigger.config; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Set; +import java.util.UUID; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class EdgeConnectionNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig { + + private Set edges; // if empty - all edges + private Set notifyOn; + + @Override + public NotificationRuleTriggerType getTriggerType() { + return NotificationRuleTriggerType.EDGE_CONNECTION; + } + + public enum EdgeConnectivityEvent { + CONNECTED, DISCONNECTED + } + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java index 5ffb8a5fe1..15a5e59255 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java @@ -36,6 +36,8 @@ import java.io.Serializable; @Type(value = EntitiesLimitNotificationRuleTriggerConfig.class, name = "ENTITIES_LIMIT"), @Type(value = ApiUsageLimitNotificationRuleTriggerConfig.class, name = "API_USAGE_LIMIT"), @Type(value = RateLimitsNotificationRuleTriggerConfig.class, name = "RATE_LIMITS"), + @Type(value = EdgeConnectionNotificationRuleTriggerConfig.class, name = "EDGE_CONNECTION"), + @Type(value = EdgeCommunicationFailureNotificationRuleTriggerConfig.class, name = "EDGE_COMMUNICATION_FAILURE"), }) public interface NotificationRuleTriggerConfig extends Serializable { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java index 6eff7a8114..8469fac752 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java @@ -26,6 +26,8 @@ public enum NotificationRuleTriggerType { ALARM_ASSIGNMENT, DEVICE_ACTIVITY, RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, + EDGE_CONNECTION, + EDGE_COMMUNICATION_FAILURE, NEW_PLATFORM_VERSION(false), ENTITIES_LIMIT(false), API_USAGE_LIMIT(false), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java index 1a4df035f5..3fe110de0b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java @@ -81,6 +81,9 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura private String cassandraQueryTenantRateLimitsConfiguration; + private String edgeEventRateLimits; + private String edgeEventRateLimitsPerEdge; + private int defaultStorageTtlDays; private int alarmsTtlDays; private int rpcTtlDays; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java index 3bc2aac1f8..a6b1c11d42 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java @@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.Map; import java.util.function.UnaryOperator; +import java.util.regex.Matcher; import java.util.regex.Pattern; import static com.google.common.base.Strings.nullToEmpty; @@ -49,7 +50,7 @@ public class TemplateUtils { value = FUNCTIONS.get(function).apply(value); } } - return value; + return Matcher.quoteReplacement(value); }); } diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java index 9dc7110340..2221b236bd 100644 --- a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java +++ b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java @@ -22,22 +22,22 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM; import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM_DELETE; -import static org.thingsboard.server.common.data.msg.TbMsgType.NA; import static org.thingsboard.server.common.data.msg.TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.DELAY_TIMEOUT_SELF_MSG; +import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_PROFILE_PERIODIC_SELF_MSG; +import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_PROFILE_UPDATE_SELF_MSG; +import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_UPDATE_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.ENTITY_ASSIGNED_TO_EDGE; import static org.thingsboard.server.common.data.msg.TbMsgType.ENTITY_UNASSIGNED_FROM_EDGE; +import static org.thingsboard.server.common.data.msg.TbMsgType.GENERATOR_NODE_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.MSG_COUNT_SELF_MSG; +import static org.thingsboard.server.common.data.msg.TbMsgType.NA; import static org.thingsboard.server.common.data.msg.TbMsgType.PROVISION_FAILURE; import static org.thingsboard.server.common.data.msg.TbMsgType.PROVISION_SUCCESS; -import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_PROFILE_PERIODIC_SELF_MSG; -import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_PROFILE_UPDATE_SELF_MSG; -import static org.thingsboard.server.common.data.msg.TbMsgType.DEVICE_UPDATE_SELF_MSG; -import static org.thingsboard.server.common.data.msg.TbMsgType.GENERATOR_NODE_SELF_MSG; import static org.thingsboard.server.common.data.msg.TbMsgType.SEND_EMAIL; class TbMsgTypeTest { - + private static final List typesWithNullRuleNodeConnection = List.of( ALARM, ALARM_DELETE, diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java index 1e06d75b15..cbf9ae34b3 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java @@ -131,6 +131,11 @@ public final class TbMsg implements Serializable { metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY); } + public static TbMsg newMsg(TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data, long ts) { + return new TbMsg(null, UUID.randomUUID(), ts, type, originator, null, + metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY); + } + // REALLY NEW MSG /** @@ -335,7 +340,7 @@ public final class TbMsg implements Serializable { this.originator = originator; if (customerId == null || customerId.isNullUid()) { if (originator != null && originator.getEntityType() == EntityType.CUSTOMER) { - this.customerId = (CustomerId) originator; + this.customerId = new CustomerId(originator.getId()); } else { this.customerId = null; } diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto index 4da2883291..6e33faaf69 100644 --- a/common/proto/src/main/proto/queue.proto +++ b/common/proto/src/main/proto/queue.proto @@ -551,6 +551,14 @@ message GetOtaPackageResponseMsg { string fileName = 8; } +message DeviceConnectProto { + int64 tenantIdMSB = 1; + int64 tenantIdLSB = 2; + int64 deviceIdMSB = 3; + int64 deviceIdLSB = 4; + int64 lastConnectTime = 5; +} + message DeviceActivityProto { int64 tenantIdMSB = 1; int64 tenantIdLSB = 2; @@ -559,6 +567,22 @@ message DeviceActivityProto { int64 lastActivityTime = 5; } +message DeviceDisconnectProto { + int64 tenantIdMSB = 1; + int64 tenantIdLSB = 2; + int64 deviceIdMSB = 3; + int64 deviceIdLSB = 4; + int64 lastDisconnectTime = 5; +} + +message DeviceInactivityProto { + int64 tenantIdMSB = 1; + int64 tenantIdLSB = 2; + int64 deviceIdMSB = 3; + int64 deviceIdLSB = 4; + int64 lastInactivityTime = 5; +} + //Used to report session state to tb-Service and persist this state in the cache on the tb-Service level. message SubscriptionInfoProto { int64 lastActivityTime = 1; @@ -1271,6 +1295,9 @@ message ToCoreMsg { LifecycleEventProto lifecycleEventMsg = 8; ErrorEventProto errorEventMsg = 9; ToDeviceActorNotificationMsgProto toDeviceActorNotification = 10; + DeviceConnectProto deviceConnectMsg = 50; + DeviceDisconnectProto deviceDisconnectMsg = 51; + DeviceInactivityProto deviceInactivityMsg = 52; } /* High priority messages with low latency are handled by ThingsBoard Core Service separately */ @@ -1280,8 +1307,8 @@ message ToCoreNotificationMsg { FromDeviceRPCResponseProto fromDeviceRpcResponse = 2; bytes componentLifecycleMsg = 3 [deprecated = true]; bytes edgeEventUpdateMsg = 4 [deprecated = true]; - QueueUpdateMsg queueUpdateMsg = 5; - QueueDeleteMsg queueDeleteMsg = 6; + repeated QueueUpdateMsg queueUpdateMsgs = 5; + repeated QueueDeleteMsg queueDeleteMsgs = 6; VersionControlResponseMsg vcResponseMsg = 7; bytes toEdgeSyncRequestMsg = 8 [deprecated = true]; bytes fromEdgeSyncResponseMsg = 9 [deprecated = true]; @@ -1307,8 +1334,8 @@ message ToRuleEngineMsg { message ToRuleEngineNotificationMsg { bytes componentLifecycleMsg = 1 [deprecated = true]; FromDeviceRPCResponseProto fromDeviceRpcResponse = 2; - QueueUpdateMsg queueUpdateMsg = 3; - QueueDeleteMsg queueDeleteMsg = 4; + repeated QueueUpdateMsg queueUpdateMsgs = 3; + repeated QueueDeleteMsg queueDeleteMsgs = 4; ComponentLifecycleMsgProto componentLifecycle = 5; } @@ -1328,8 +1355,8 @@ message ToTransportMsg { ResourceUpdateMsg resourceUpdateMsg = 12; ResourceDeleteMsg resourceDeleteMsg = 13; UplinkNotificationMsg uplinkNotificationMsg = 14; - QueueUpdateMsg queueUpdateMsg = 15; - QueueDeleteMsg queueDeleteMsg = 16; + repeated QueueUpdateMsg queueUpdateMsgs = 15; + repeated QueueDeleteMsg queueDeleteMsgs = 16; } message UsageStatsKVProto{ diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/SimpleTbQueueCallback.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/SimpleTbQueueCallback.java new file mode 100644 index 0000000000..d153998ab4 --- /dev/null +++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/SimpleTbQueueCallback.java @@ -0,0 +1,47 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.queue.common; + +import org.thingsboard.server.queue.TbQueueCallback; +import org.thingsboard.server.queue.TbQueueMsgMetadata; + +import java.util.function.Consumer; + +public class SimpleTbQueueCallback implements TbQueueCallback { + + private final Consumer onSuccess; + private final Consumer onFailure; + + public SimpleTbQueueCallback(Consumer onSuccess, Consumer onFailure) { + this.onSuccess = onSuccess; + this.onFailure = onFailure; + } + + @Override + public void onSuccess(TbQueueMsgMetadata metadata) { + if (onSuccess != null) { + onSuccess.accept(metadata); + } + } + + @Override + public void onFailure(Throwable t) { + if (onFailure != null) { + onFailure.accept(t); + } + } + +} diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java index c05bc77df3..4630dc4bf8 100644 --- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java +++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java @@ -171,27 +171,35 @@ public class HashPartitionService implements PartitionService { } @Override - public void updateQueue(TransportProtos.QueueUpdateMsg queueUpdateMsg) { - TenantId tenantId = new TenantId(new UUID(queueUpdateMsg.getTenantIdMSB(), queueUpdateMsg.getTenantIdLSB())); - QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueUpdateMsg.getQueueName(), tenantId); - partitionTopicsMap.put(queueKey, queueUpdateMsg.getQueueTopic()); - partitionSizesMap.put(queueKey, queueUpdateMsg.getPartitions()); - myPartitions.remove(queueKey); - if (!tenantId.isSysTenantId()) { - tenantRoutingInfoMap.remove(tenantId); + public void updateQueues(List queueUpdateMsgs) { + for (TransportProtos.QueueUpdateMsg queueUpdateMsg : queueUpdateMsgs) { + TenantId tenantId = TenantId.fromUUID(new UUID(queueUpdateMsg.getTenantIdMSB(), queueUpdateMsg.getTenantIdLSB())); + QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueUpdateMsg.getQueueName(), tenantId); + partitionTopicsMap.put(queueKey, queueUpdateMsg.getQueueTopic()); + partitionSizesMap.put(queueKey, queueUpdateMsg.getPartitions()); + if (!tenantId.isSysTenantId()) { + tenantRoutingInfoMap.remove(tenantId); + } } } @Override - public void removeQueue(TransportProtos.QueueDeleteMsg queueDeleteMsg) { - TenantId tenantId = new TenantId(new UUID(queueDeleteMsg.getTenantIdMSB(), queueDeleteMsg.getTenantIdLSB())); - QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, queueDeleteMsg.getQueueName(), tenantId); - myPartitions.remove(queueKey); - partitionTopicsMap.remove(queueKey); - partitionSizesMap.remove(queueKey); - evictTenantInfo(tenantId); + public void removeQueues(List queueDeleteMsgs) { + List queueKeys = queueDeleteMsgs.stream() + .map(queueDeleteMsg -> { + TenantId tenantId = TenantId.fromUUID(new UUID(queueDeleteMsg.getTenantIdMSB(), queueDeleteMsg.getTenantIdLSB())); + return new QueueKey(ServiceType.TB_RULE_ENGINE, queueDeleteMsg.getQueueName(), tenantId); + }) + .collect(Collectors.toList()); + queueKeys.forEach(queueKey -> { + myPartitions.remove(queueKey); + partitionTopicsMap.remove(queueKey); + partitionSizesMap.remove(queueKey); + evictTenantInfo(queueKey.getTenantId()); + }); if (serviceInfoProvider.isService(ServiceType.TB_RULE_ENGINE)) { - publishPartitionChangeEvent(ServiceType.TB_RULE_ENGINE, Map.of(queueKey, Collections.emptySet())); + publishPartitionChangeEvent(ServiceType.TB_RULE_ENGINE, queueKeys.stream() + .collect(Collectors.toMap(k -> k, k -> Collections.emptySet()))); } } @@ -321,13 +329,11 @@ public class HashPartitionService implements PartitionService { .forEach(removed::add); } removed.forEach(queueKey -> { - log.info("[{}] NO MORE PARTITIONS FOR CURRENT KEY", queueKey); changedPartitionsMap.put(queueKey, Collections.emptySet()); }); myPartitions.forEach((queueKey, partitions) -> { if (!partitions.equals(oldPartitions.get(queueKey))) { - log.info("[{}] NEW PARTITIONS: {}", queueKey, partitions); Set tpiList = partitions.stream() .map(partition -> buildTopicPartitionInfo(queueKey, partition)) .collect(Collectors.toSet()); @@ -373,14 +379,11 @@ public class HashPartitionService implements PartitionService { } private void publishPartitionChangeEvent(ServiceType serviceType, Map> partitionsMap) { - if (log.isDebugEnabled()) { - log.debug("Publishing partition change event for service type " + serviceType + ":" + System.lineSeparator() + - partitionsMap.entrySet().stream() - .map(entry -> entry.getKey() + " - " + entry.getValue().stream() - .map(TopicPartitionInfo::getFullTopicName).sorted() - .collect(Collectors.toList())) - .collect(Collectors.joining(System.lineSeparator()))); - } + log.info("Partitions changed: {}", System.lineSeparator() + partitionsMap.entrySet().stream() + .map(entry -> "[" + entry.getKey() + "] - [" + entry.getValue().stream() + .map(tpi -> tpi.getPartition().orElse(-1).toString()).sorted() + .collect(Collectors.joining(", ")) + "]") + .collect(Collectors.joining(System.lineSeparator()))); PartitionChangeEvent event = new PartitionChangeEvent(this, serviceType, partitionsMap); try { applicationEventPublisher.publishEvent(event); @@ -490,7 +493,7 @@ public class HashPartitionService implements PartitionService { } private void logServiceInfo(TransportProtos.ServiceInfo server) { - log.info("[{}] Found common server: [{}]", server.getServiceId(), server.getServiceTypesList()); + log.info("[{}] Found common server: {}", server.getServiceId(), server.getServiceTypesList()); } private void addNode(Map> queueServiceList, ServiceInfo instance) { diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/PartitionService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/PartitionService.java index 2b2479f59b..e14a6c3947 100644 --- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/PartitionService.java +++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/PartitionService.java @@ -63,9 +63,9 @@ public interface PartitionService { int countTransportsByType(String type); - void updateQueue(TransportProtos.QueueUpdateMsg queueUpdateMsg); + void updateQueues(List queueUpdateMsgs); - void removeQueue(TransportProtos.QueueDeleteMsg queueDeleteMsg); + void removeQueues(List queueDeleteMsgs); void removeTenant(TenantId tenantId); diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java index 735ec1d524..eaf105ee48 100644 --- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java +++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java @@ -220,7 +220,7 @@ public class DefaultCoapClientContext implements CoapClientContext { private void onUplink(TbCoapClientState client, boolean notifyOtherServers, long uplinkTs) { PowerMode powerMode = client.getPowerMode(); PowerSavingConfiguration profileSettings = null; - if (powerMode == null) { + if (powerMode == null && client.getProfileId() != null) { var clientProfile = getProfile(client.getProfileId()); if (clientProfile.isPresent()) { profileSettings = clientProfile.get().getClientSettings(); @@ -726,7 +726,7 @@ public class DefaultCoapClientContext implements CoapClientContext { private boolean isDownlinkAllowed(TbCoapClientState client) { PowerMode powerMode = client.getPowerMode(); PowerSavingConfiguration profileSettings = null; - if (powerMode == null) { + if (powerMode == null && client.getProfileId() != null) { var clientProfile = getProfile(client.getProfileId()); if (clientProfile.isPresent()) { profileSettings = clientProfile.get().getClientSettings(); @@ -775,11 +775,12 @@ public class DefaultCoapClientContext implements CoapClientContext { private PowerMode getPowerMode(TbCoapClientState client) { PowerMode powerMode = client.getPowerMode(); if (powerMode == null) { - Optional deviceProfile = getProfile(client.getProfileId()); - if (deviceProfile.isPresent()) { - powerMode = deviceProfile.get().getClientSettings().getPowerMode(); - } else { - powerMode = PowerMode.PSM; + powerMode = PowerMode.PSM; + if (client.getProfileId() != null) { + Optional deviceProfile = getProfile(client.getProfileId()); + if (deviceProfile.isPresent()) { + powerMode = deviceProfile.get().getClientSettings().getPowerMode(); + } } } return powerMode; diff --git a/common/transport/lwm2m/pom.xml b/common/transport/lwm2m/pom.xml index 0f00bbb2c9..530000f95e 100644 --- a/common/transport/lwm2m/pom.xml +++ b/common/transport/lwm2m/pom.xml @@ -94,6 +94,11 @@ junit-vintage-engine test + + org.mockito + mockito-inline + test + org.awaitility awaitility diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java index 4bdcbcf645..a9166b0bf1 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java @@ -38,6 +38,7 @@ import javax.annotation.PreDestroy; import java.security.cert.X509Certificate; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CURVES_ONLY; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT; @@ -95,6 +96,7 @@ public class LwM2MTransportBootstrapService { dtlsConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, serverConfig.isRecommendedSupportedGroups()); dtlsConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, serverConfig.isRecommendedCiphers()); dtlsConfig.set(DTLS_RETRANSMISSION_TIMEOUT, serverConfig.getDtlsRetransmissionTimeout(), MILLISECONDS); + dtlsConfig.set(DTLS_CONNECTION_ID_LENGTH, serverConfig.getDtlsConnectionIdLength()); dtlsConfig.set(DTLS_ROLE, SERVER_ONLY); setServerWithCredentials(builder, dtlsConfig); diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java index 0ccf6e1969..dc2e9f6d45 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java @@ -41,6 +41,10 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig { @Value("${transport.lwm2m.dtls.retransmission_timeout:9000}") private int dtlsRetransmissionTimeout; + @Getter + @Value("${transport.lwm2m.dtls.connection_id_length:6}") + private Integer dtlsConnectionIdLength; + @Getter @Value("${transport.lwm2m.timeout:}") private Long timeout; diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java index 4037251572..7d54e97cde 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java @@ -43,6 +43,7 @@ import javax.annotation.PreDestroy; import java.security.cert.X509Certificate; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CURVES_ONLY; import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT; @@ -139,6 +140,7 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService { dtlsConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, config.isRecommendedSupportedGroups()); dtlsConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, config.isRecommendedCiphers()); dtlsConfig.set(DTLS_RETRANSMISSION_TIMEOUT, config.getDtlsRetransmissionTimeout(), MILLISECONDS); + dtlsConfig.set(DTLS_CONNECTION_ID_LENGTH, config.getDtlsConnectionIdLength()); dtlsConfig.set(DTLS_ROLE, SERVER_ONLY); /* Create credentials */ diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java index 03449aaaef..18e27ba568 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java @@ -411,7 +411,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext { public boolean isDownlinkAllowed(LwM2mClient client) { PowerMode powerMode = client.getPowerMode(); OtherConfiguration profileSettings = null; - if (powerMode == null) { + if (powerMode == null && client.getProfileId() != null) { var clientProfile = getProfile(client.getProfileId()); profileSettings = clientProfile.getClientLwM2mSettings(); powerMode = profileSettings.getPowerMode(); @@ -419,7 +419,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext { powerMode = PowerMode.DRX; } } - if (PowerMode.DRX.equals(powerMode) || otaUpdateService.isOtaDownloading(client)) { + if (powerMode == null || PowerMode.DRX.equals(powerMode) || otaUpdateService.isOtaDownloading(client)) { return true; } client.lock(); @@ -460,7 +460,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext { public void onUplink(LwM2mClient client) { PowerMode powerMode = client.getPowerMode(); OtherConfiguration profileSettings = null; - if (powerMode == null) { + if (powerMode == null && client.getProfileId() != null) { var clientProfile = getProfile(client.getProfileId()); profileSettings = clientProfile.getClientLwM2mSettings(); powerMode = profileSettings.getPowerMode(); @@ -468,7 +468,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext { powerMode = PowerMode.DRX; } } - if (PowerMode.DRX.equals(powerMode)) { + if (powerMode == null || PowerMode.DRX.equals(powerMode)) { client.updateLastUplinkTime(); return; } diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java index ff86e60490..23c7a57dd6 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java @@ -29,7 +29,6 @@ import org.eclipse.leshan.core.util.NamedThreadFactory; import org.eclipse.leshan.core.util.Validate; import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore; import org.eclipse.leshan.server.redis.RedisRegistrationStore; -import org.eclipse.leshan.server.redis.serialization.IdentitySerDes; import org.eclipse.leshan.server.redis.serialization.ObservationSerDes; import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes; import org.eclipse.leshan.server.registration.Deregistration; @@ -45,6 +44,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.ScanOptions; import org.springframework.integration.redis.util.RedisLockRegistry; +import org.thingsboard.server.transport.lwm2m.server.store.util.LwM2MIdentitySerDes; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -110,12 +110,18 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory, ScheduledExecutorService schedExecutor, long cleanPeriodInSec, long lifetimeGracePeriodInSec, int cleanLimit) { + this(connectionFactory, schedExecutor, cleanPeriodInSec, lifetimeGracePeriodInSec, cleanLimit, + new RedisLockRegistry(connectionFactory, "Registration")); + } + + public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory, ScheduledExecutorService schedExecutor, long cleanPeriodInSec, + long lifetimeGracePeriodInSec, int cleanLimit, RedisLockRegistry lockRegistry) { this.connectionFactory = connectionFactory; this.schedExecutor = schedExecutor; this.cleanPeriod = cleanPeriodInSec; this.cleanLimit = cleanLimit; this.gracePeriod = lifetimeGracePeriodInSec; - this.redisLock = new RedisLockRegistry(connectionFactory, "Registration"); + this.redisLock = lockRegistry; } /* *************** Redis Key utility function **************** */ @@ -173,7 +179,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto if (!oldRegistration.getSocketAddress().equals(registration.getSocketAddress())) { removeAddrIndex(connection, oldRegistration); } - if (!oldRegistration.getIdentity().equals(registration.getIdentity())) { + if (registrationsHaveDifferentIdentities(oldRegistration, registration)) { removeIdentityIndex(connection, oldRegistration); } // remove old observation @@ -231,7 +237,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto if (!r.getSocketAddress().equals(updatedRegistration.getSocketAddress())) { removeAddrIndex(connection, r); } - if (!r.getIdentity().equals(updatedRegistration.getIdentity())) { + if (registrationsHaveDifferentIdentities(r, updatedRegistration)) { removeIdentityIndex(connection, r); } @@ -402,6 +408,12 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto connection.zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8)); } + private boolean registrationsHaveDifferentIdentities(Registration first, Registration second){ + var first_identity_string = LwM2MIdentitySerDes.serialize(first.getIdentity()).toString(); + var second_identity_string = LwM2MIdentitySerDes.serialize(second.getIdentity()).toString(); + return !first_identity_string.equals(second_identity_string); + } + private byte[] toRegIdKey(String registrationId) { return toKey(REG_EP_REGID_IDX, registrationId); } @@ -411,7 +423,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto } private byte[] toRegIdentityKey(Identity identity) { - return toKey(REG_EP_IDENTITY, IdentitySerDes.serialize(identity).toString()); + return toKey(REG_EP_IDENTITY, LwM2MIdentitySerDes.serialize(identity).toString()); } private byte[] toEndpointKey(String endpoint) { diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java new file mode 100644 index 0000000000..4ffbfd82bb --- /dev/null +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java @@ -0,0 +1,63 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.server.store.util; + +import com.eclipsesource.json.Json; +import com.eclipsesource.json.JsonObject; +import org.apache.commons.lang3.NotImplementedException; +import org.eclipse.leshan.core.request.Identity; +import org.eclipse.leshan.core.util.Hex; + +import java.security.PublicKey; + +public class LwM2MIdentitySerDes { + + private static final String KEY_ADDRESS = "address"; + private static final String KEY_PORT = "port"; + private static final String KEY_ID = "id"; + private static final String KEY_CN = "cn"; + private static final String KEY_RPK = "rpk"; + protected static final String KEY_LWM2MIDENTITY_TYPE = "type"; + protected static final String LWM2MIDENTITY_TYPE_UNSECURE = "unsecure"; + protected static final String LWM2MIDENTITY_TYPE_PSK = "psk"; + protected static final String LWM2MIDENTITY_TYPE_X509 = "x509"; + protected static final String LWM2MIDENTITY_TYPE_RPK = "rpk"; + + public static JsonObject serialize(Identity identity) { + JsonObject o = Json.object(); + + if (identity.isPSK()) { + o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_PSK); + o.set(KEY_ID, identity.getPskIdentity()); + } else if (identity.isRPK()) { + o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_RPK); + PublicKey publicKey = identity.getRawPublicKey(); + o.set(KEY_RPK, Hex.encodeHexString(publicKey.getEncoded())); + } else if (identity.isX509()) { + o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_X509); + o.set(KEY_CN, identity.getX509CommonName()); + } else { + o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_UNSECURE); + o.set(KEY_ADDRESS, identity.getPeerAddress().getHostString()); + o.set(KEY_PORT, identity.getPeerAddress().getPort()); + } + return o; + } + + public static Identity deserialize(JsonObject peer) { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java new file mode 100644 index 0000000000..23293c7b7a --- /dev/null +++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java @@ -0,0 +1,105 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.bootstrap; + +import org.eclipse.californium.core.network.CoapEndpoint; +import org.eclipse.californium.scandium.config.DtlsConnectorConfig; +import org.eclipse.leshan.server.californium.LeshanServer; +import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer; +import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.server.cache.ota.OtaPackageDataCache; +import org.thingsboard.server.common.transport.TransportService; +import org.thingsboard.server.transport.lwm2m.bootstrap.secure.TbLwM2MDtlsBootstrapCertificateVerifier; +import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MBootstrapSecurityStore; +import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MInMemoryBootstrapConfigStore; +import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportBootstrapConfig; +import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig; +import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer; +import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier; +import org.thingsboard.server.transport.lwm2m.server.store.TbSecurityStore; +import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.when; + +@ExtendWith(MockitoExtension.class) +public class LwM2MTransportBootstrapServiceTest { + + @Mock + private LwM2MTransportServerConfig serverConfig; + @Mock + private LwM2MTransportBootstrapConfig bootstrapConfig; + @Mock + private LwM2MBootstrapSecurityStore lwM2MBootstrapSecurityStore; + @Mock + private LwM2MInMemoryBootstrapConfigStore lwM2MInMemoryBootstrapConfigStore; + @Mock + private TransportService transportService; + @Mock + private TbLwM2MDtlsBootstrapCertificateVerifier certificateVerifier; + + + @Test + public void getLHServer_creates_ConnectionIdGenerator_when_connection_id_length_not_null(){ + final Integer CONNECTION_ID_LENGTH = 6; + when(serverConfig.getDtlsConnectionIdLength()).thenReturn(CONNECTION_ID_LENGTH); + var lwM2MBootstrapService = createLwM2MBootstrapService(); + + var server = lwM2MBootstrapService.getLhBootstrapServer(); + var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint"); + assertThat(securedEndpoint).isNotNull(); + + var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config"); + assertThat(config).isNotNull(); + assertThat(config.getConnectionIdGenerator()).isNotNull(); + assertThat((Integer) ReflectionTestUtils.getField(config.getConnectionIdGenerator(), "connectionIdLength")) + .isEqualTo(CONNECTION_ID_LENGTH); + } + + @Test + public void getLHServer_creates_no_ConnectionIdGenerator_when_connection_id_length_is_null(){ + when(serverConfig.getDtlsConnectionIdLength()).thenReturn(null); + var lwM2MBootstrapService = createLwM2MBootstrapService(); + + var server = lwM2MBootstrapService.getLhBootstrapServer(); + var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint"); + assertThat(securedEndpoint).isNotNull(); + + var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config"); + assertThat(config).isNotNull(); + assertThat(config.getConnectionIdGenerator()).isNull(); + } + + private LwM2MTransportBootstrapService createLwM2MBootstrapService() { + setDefaultConfigVariables(); + return new LwM2MTransportBootstrapService(serverConfig, bootstrapConfig, lwM2MBootstrapSecurityStore, + lwM2MInMemoryBootstrapConfigStore, transportService, certificateVerifier); + } + + private void setDefaultConfigVariables(){ + when(bootstrapConfig.getPort()).thenReturn(5683); + when(bootstrapConfig.getSecurePort()).thenReturn(5684); + when(serverConfig.isRecommendedCiphers()).thenReturn(false); + when(serverConfig.getDtlsRetransmissionTimeout()).thenReturn(9000); + } + + +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfigTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfigTest.java new file mode 100644 index 0000000000..7e657dd932 --- /dev/null +++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfigTest.java @@ -0,0 +1,61 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.config; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootContextLoader; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig; + +import static org.assertj.core.api.Assertions.assertThat; + +@ExtendWith(SpringExtension.class) +@EnableConfigurationProperties(value = LwM2MTransportServerConfig.class) +@ContextConfiguration(classes = {LwM2MTransportServerConfig.class}, loader = SpringBootContextLoader.class) +@TestPropertySource(properties = { + "transport.sessions.report_timeout=10", + "transport.lwm2m.security.recommended_ciphers=true", + "transport.lwm2m.security.recommended_supported_groups=true", + "transport.lwm2m.downlink_pool_size=10", + "transport.lwm2m.uplink_pool_size=10", + "transport.lwm2m.ota_pool_size=10", + "transport.lwm2m.clean_period_in_sec=2", + "transport.lwm2m.dtls.connection_id_length=" + +}) +class LwM2MTransportServerConfigTest { + + @MockBean(name = "lwm2mServerCredentials") + private SslCredentialsConfig credentialsConfig; + + @MockBean(name = "lwm2mTrustCredentials") + private SslCredentialsConfig trustCredentialsConfig; + + @Autowired + private LwM2MTransportServerConfig serverConfig; + + @Test + void getDtlsConnectionIdLength_return_null_is_property_is_empty() { + // note: transport.lwm2m.dtls.connect_id_length is set in TestPropertySource + assertThat(serverConfig.getDtlsConnectionIdLength()).isNull(); + } +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java new file mode 100644 index 0000000000..92f60ebb8e --- /dev/null +++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java @@ -0,0 +1,109 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.server; + +import org.eclipse.californium.core.network.CoapEndpoint; +import org.eclipse.californium.scandium.config.DtlsConnectorConfig; +import org.eclipse.leshan.server.californium.LeshanServer; +import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.server.cache.ota.OtaPackageDataCache; +import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig; +import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer; +import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier; +import org.thingsboard.server.transport.lwm2m.server.store.TbSecurityStore; +import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.when; + +@ExtendWith(MockitoExtension.class) +public class DefaultLwM2mTransportServiceTest { + + @Mock + private LwM2mTransportContext context; + + @Mock + private LwM2MTransportServerConfig config; + @Mock + private OtaPackageDataCache otaPackageDataCache; + @Mock + private LwM2mUplinkMsgHandler handler; + @Mock + private CaliforniumRegistrationStore registrationStore; + @Mock + private TbSecurityStore securityStore; + @Mock + private TbLwM2MDtlsCertificateVerifier certificateVerifier; + @Mock + private TbLwM2MAuthorizer authorizer; + @Mock + private LwM2mVersionedModelProvider modelProvider; + + + @Test + public void getLHServer_creates_ConnectionIdGenerator_when_connection_id_length_not_null(){ + final Integer CONNECTION_ID_LENGTH = 6; + when(config.getDtlsConnectionIdLength()).thenReturn(CONNECTION_ID_LENGTH); + var lwm2mService = createLwM2MService(); + + LeshanServer server = ReflectionTestUtils.invokeMethod(lwm2mService, "getLhServer"); + + assertThat(server).isNotNull(); + var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint"); + assertThat(securedEndpoint).isNotNull(); + + var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config"); + assertThat(config).isNotNull(); + assertThat(config.getConnectionIdGenerator()).isNotNull(); + assertThat((Integer) ReflectionTestUtils.getField(config.getConnectionIdGenerator(), "connectionIdLength")) + .isEqualTo(CONNECTION_ID_LENGTH); + } + + @Test + public void getLHServer_creates_no_ConnectionIdGenerator_when_connection_id_length_is_null(){ + when(config.getDtlsConnectionIdLength()).thenReturn(null); + var lwm2mService = createLwM2MService(); + + LeshanServer server = ReflectionTestUtils.invokeMethod(lwm2mService, "getLhServer"); + + assertThat(server).isNotNull(); + var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint"); + assertThat(securedEndpoint).isNotNull(); + var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config"); + assertThat(config).isNotNull(); + assertThat(config.getConnectionIdGenerator()).isNull(); + } + + private DefaultLwM2mTransportService createLwM2MService() { + setDefaultConfigVariables(); + return new DefaultLwM2mTransportService(context, config, otaPackageDataCache, handler, registrationStore, + securityStore, certificateVerifier, authorizer, modelProvider); + } + + private void setDefaultConfigVariables(){ + when(config.getPort()).thenReturn(5683); + when(config.getSecurePort()).thenReturn(5684); + when(config.isRecommendedCiphers()).thenReturn(false); + when(config.getDtlsRetransmissionTimeout()).thenReturn(9000); + } + + +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java new file mode 100644 index 0000000000..e09f2205b7 --- /dev/null +++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java @@ -0,0 +1,265 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.server.store; + +import org.eclipse.leshan.core.link.Link; +import org.eclipse.leshan.core.request.Identity; +import org.eclipse.leshan.core.util.NamedThreadFactory; +import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes; +import org.eclipse.leshan.server.registration.Registration; +import org.eclipse.leshan.server.registration.RegistrationUpdate; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.integration.redis.util.RedisLockRegistry; +import org.springframework.test.util.ReflectionTestUtils; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.locks.Lock; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_CLEAN_LIMIT; +import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_CLEAN_PERIOD; +import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_GRACE_PERIOD; + + +@ExtendWith(MockitoExtension.class) +class TbLwM2mRedisRegistrationStoreTest { + + RedisConnectionFactory connectionFactory; + RedisConnection connection; + RedisLockRegistry lockRegistry; + + TbLwM2mRedisRegistrationStore registrationStore; + + @BeforeEach + void setUp() { + lockRegistry = mock(RedisLockRegistry.class); + lenient().when(lockRegistry.obtain(any())).thenReturn(mock(Lock.class)); + connection = mock(RedisConnection.class); + //when(connection.set(any(byte[].class), any(byte[].class))). + connectionFactory = mock(RedisConnectionFactory.class); + lenient().when(connectionFactory.getConnection()).thenReturn(connection); + ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1, + new NamedThreadFactory(String.format("RedisRegistrationStore Cleaner (%ds)", DEFAULT_CLEAN_PERIOD))); + registrationStore = new TbLwM2mRedisRegistrationStore(connectionFactory, executorService, + DEFAULT_CLEAN_PERIOD, DEFAULT_GRACE_PERIOD, DEFAULT_CLEAN_LIMIT, lockRegistry); + } + + @Test + void testAddRegistrationWithNoOldRegistration() { + setOldRegistration(null); + Registration registration = buildRegistration(); + + assertThat(registrationStore.addRegistration(registration)).isNull(); + + byte[] endpoint = registration.getEndpoint().getBytes(UTF_8); + verify(connection, times(1)).set(getRegIdKey(registration), endpoint); + verify(connection, times(1)).set(getRegAddrKey(registration), endpoint); + verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint); + verify(connection, times(3)).set(any(byte[].class), any(byte[].class)); + verify(connection, times(0)).del(any(byte[].class)); + } + + @Test + void testAddRegistrationWithOldRegistrationEqualToCurrent(){ + var oldRegistration = buildRegistration(); + setOldRegistration(oldRegistration); + Registration registration = buildRegistration(); + + var deregistration = registrationStore.addRegistration(registration); + + assertThat(deregistration.getRegistration()).isEqualTo(oldRegistration); + + byte[] endpoint = registration.getEndpoint().getBytes(UTF_8); + verify(connection, times(1)).set(getRegIdKey(registration), endpoint); + verify(connection, times(1)).set(getRegAddrKey(registration), endpoint); + verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint); + verify(connection, times(3)).set(any(byte[].class), any(byte[].class)); + verify(connection, times(1)).del(getTknsRegIdKey(oldRegistration)); + verify(connection, times(1)).del(any(byte[].class)); + } + + @Test + void testAddRegistrationRemovesIndexes(){ + var oldRegistration = buildRegistration(Identity.unsecure(getTestAddress(1234))); + setOldRegistration(oldRegistration); + var registration = buildRegistration(Identity.unsecure(getTestAddress(2345))); + + var deregistration = registrationStore.addRegistration(registration); + + assertThat(deregistration.getRegistration()).isEqualTo(oldRegistration); + byte[] endpoint = registration.getEndpoint().getBytes(UTF_8); + verify(connection, times(1)).set(getRegIdKey(registration), endpoint); + verify(connection, times(1)).set(getRegAddrKey(registration), endpoint); + verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint); + verify(connection, times(3)).set(any(byte[].class), any(byte[].class)); + verify(connection, times(1)).del(getRegAddrKey(oldRegistration)); + verify(connection, times(1)).del(getRegIdentityKey(oldRegistration)); + verify(connection, times(1)).del(getTknsRegIdKey(oldRegistration)); + verify(connection, times(3)).del(any(byte[].class)); + } + + @Test + void testUpdateRegistrationWhenNoRegistrationFound() { + setOldRegistration(null); + Registration registration = buildRegistration(); + RegistrationUpdate update = createUpdateFromRegistration(registration); + + assertThat(registrationStore.updateRegistration(update)).isNull(); + + verify(connection, times(1)).get(getRegIdKey(registration)); + verify(connection, times(1)).get(any(byte[].class)); + verify(connection, times(0)).del(any(byte[].class)); + } + + @Test + void testUpdateRegistrationWithSameRegistration() { + Registration registration = buildRegistration(); + setOldRegistration(registration); + RegistrationUpdate update = createUpdateFromRegistration(registration); + + assertThat(registrationStore.updateRegistration(update)).isNotNull(); + + var endpoint = registration.getEndpoint().getBytes(UTF_8); + // check registration and addressIndex here updated + verify(connection, times(1)).set(eq(getEndpointKey(endpoint)), any(byte[].class)); + verify(connection, times(1)).set(getRegAddrKey(registration), endpoint); + verify(connection, times(2)).set(any(byte[].class), any(byte[].class)); + verify(connection, times(0)).del(any(byte[].class)); + } + + @Test + void testUpdateRegistrationWithRegistrationFromSecureIdentitiesWithDifferentAddress() { + Registration oldRegistration = buildRegistration(Identity.psk(getTestAddress(1234), "my:psk")); + setOldRegistration(oldRegistration); + Registration newRegistration = buildRegistration(Identity.psk(getTestAddress(2345), "my:psk")); + RegistrationUpdate update = createUpdateFromRegistration(newRegistration); + assertThat(oldRegistration.getEndpoint()).isEqualTo(newRegistration.getEndpoint()); + + assertThat(registrationStore.updateRegistration(update)).isNotNull(); + + var endpoint = newRegistration.getEndpoint().getBytes(UTF_8); + // check registration and addressIndex here updated + verify(connection, times(1)).set(eq(getEndpointKey(endpoint)), any(byte[].class)); + verify(connection, times(1)).set(getRegAddrKey(newRegistration), endpoint); + // check old AddrIndex has been removed + verify(connection, times(1)).del(getRegAddrKey(oldRegistration)); + // check identityIndex has not been removed + verify(connection, times(0)).del(getRegIdentityKey(oldRegistration)); + // check only one key (AddrIndex) in total was removed + verify(connection, times(1)).del(any(byte[].class)); + } + + @Test + void testGetRegistrationByIdentityReturnsRegistrationForSecureIdentityWithDifferentAddress() { + Registration registration = buildRegistration(Identity.psk(getTestAddress(1234), "my:psk")); + setOldRegistration(registration); + Identity sameIdentityWithDifferentAddress = Identity.psk(getTestAddress(2345), "my:psk"); + + Registration retrievedRegistration = registrationStore.getRegistrationByIdentity(sameIdentityWithDifferentAddress); + + assertThat(retrievedRegistration).isEqualTo(registration); + } + + private void setOldRegistration(Registration oldRegistration){ + byte[] serializedRegistration = null; + if (oldRegistration != null){ + byte[] endpoint = oldRegistration.getEndpoint().getBytes(UTF_8); + // set the AddrIndex + byte[] regAddrKey = getRegAddrKey(oldRegistration); + lenient().when(connection.get(eq(regAddrKey))).thenReturn(endpoint); + // set the IdentityIndex + byte[] regIdentityKey = getRegIdentityKey(oldRegistration); + lenient().when(connection.get(eq(regIdentityKey))).thenReturn(endpoint); + // set the IdIndex + byte[] regIdKey = getRegIdKey(oldRegistration); + lenient().when(connection.get(eq(regIdKey))).thenReturn(endpoint); + // set the registration + serializedRegistration = RegistrationSerDes.bSerialize(oldRegistration); + lenient().when(connection.get(eq(getEndpointKey(endpoint)))).thenReturn(serializedRegistration); + } + lenient().when(connection.getSet(any(byte[].class), any(byte[].class))).thenReturn(serializedRegistration); + } + + private byte[] getRegAddrKey(Registration registration){ + return ReflectionTestUtils.invokeMethod(registrationStore, "toRegAddrKey", registration.getSocketAddress()); + } + + private byte[] getRegIdentityKey(Registration registration){ + return ReflectionTestUtils.invokeMethod(registrationStore, "toRegIdentityKey", registration.getIdentity()); + } + + private byte[] getRegIdKey(Registration registration){ + return ReflectionTestUtils.invokeMethod(registrationStore, "toRegIdKey", registration.getId()); + } + + private byte[] getEndpointKey(byte[] endpoint){ + return ReflectionTestUtils.invokeMethod(registrationStore, "toEndpointKey", endpoint); + } + + private byte[] getTknsRegIdKey(Registration registration){ + return ReflectionTestUtils.invokeMethod(registrationStore, "toKey", "TKNS:REGID:", registration.getId()); + } + + private static Registration buildRegistration() { + return buildRegistration(Identity.psk(getTestAddress(), "my:psk")); + } + + private static Registration buildRegistration(Identity identity){ + return new Registration.Builder("my_reg_id", "abcde", identity) + .objectLinks(new Link[]{}) + .build(); + } + + private static RegistrationUpdate createUpdateFromRegistration(Registration registration){ + return new RegistrationUpdate( + registration.getId(), + registration.getIdentity(), + registration.getLifeTimeInSec(), + registration.getSmsNumber(), + registration.getBindingMode(), + registration.getObjectLinks(), + registration.getAdditionalRegistrationAttributes() + ); + } + + private static InetSocketAddress getTestAddress() { + return getTestAddress(5684); + } + + private static InetSocketAddress getTestAddress(int port) { + try { + return new InetSocketAddress(InetAddress.getByName("1.2.3.4"), port); + } catch (UnknownHostException e) { + throw new AssertionError("Cannot create test address"); + } + } +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java new file mode 100644 index 0000000000..c75ed7a195 --- /dev/null +++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java @@ -0,0 +1,77 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.lwm2m.server.store.util; + +import com.eclipsesource.json.JsonObject; +import org.apache.commons.lang3.NotImplementedException; +import org.eclipse.leshan.core.request.Identity; +import org.junit.jupiter.api.Test; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.security.PublicKey; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class LwM2MIdentitySerDesTest { + + @Test + void serializePskIdentity() { + assertThat(LwM2MIdentitySerDes.serialize(Identity.psk(getTestAddress(), "my:psk")).toString()) + .isEqualTo("{\"type\":\"psk\",\"id\":\"my:psk\"}"); + } + + + @Test + void serializeRpkIdentity() { + var public_key = mock(PublicKey.class); + when(public_key.getEncoded()).thenReturn(new byte[]{1,2,3,4,5,6,7,8,9}); + + assertThat(LwM2MIdentitySerDes.serialize(Identity.rpk(getTestAddress(), public_key)).toString()) + .isEqualTo("{\"type\":\"rpk\",\"rpk\":\"010203040506070809\"}"); + } + + @Test + void serializeX509Identity() { + assertThat(LwM2MIdentitySerDes.serialize(Identity.x509(getTestAddress(), "MyCommonName")).toString()) + .isEqualTo("{\"type\":\"x509\",\"cn\":\"MyCommonName\"}"); + } + + @Test + void serializeUnsecureIdentity() { + assertThat(LwM2MIdentitySerDes.serialize(Identity.unsecure(getTestAddress())).toString()) + .isEqualTo("{\"type\":\"unsecure\",\"address\":\"1.2.3.4\",\"port\":5684}"); + } + + + @Test + void deserialize() { + assertThatThrownBy(() -> LwM2MIdentitySerDes.deserialize(mock(JsonObject.class))) + .isInstanceOf(NotImplementedException.class); + } + + private static InetSocketAddress getTestAddress() { + try { + return new InetSocketAddress(InetAddress.getByName("1.2.3.4"), 5684); + } catch (UnknownHostException e) { + throw new AssertionError("Cannot create test address"); + } + } +} \ No newline at end of file diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java index a59013bbfe..6e30b06a2c 100644 --- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java +++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/SnmpTransportContext.java @@ -152,12 +152,14 @@ public class SnmpTransportContext extends TransportContext { try { if (!newProfileTransportConfiguration.equals(sessionContext.getProfileTransportConfiguration())) { sessionContext.setProfileTransportConfiguration(newProfileTransportConfiguration); + sessionContext.setDevice(device); sessionContext.initializeTarget(newProfileTransportConfiguration, newDeviceTransportConfiguration); snmpTransportService.cancelQueryingTasks(sessionContext); snmpTransportService.createQueryingTasks(sessionContext); transportService.lifecycleEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), ComponentLifecycleEvent.UPDATED, true, null); } else if (!newDeviceTransportConfiguration.equals(sessionContext.getDeviceTransportConfiguration())) { sessionContext.setDeviceTransportConfiguration(newDeviceTransportConfiguration); + sessionContext.setDevice(device); sessionContext.initializeTarget(newProfileTransportConfiguration, newDeviceTransportConfiguration); transportService.lifecycleEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), ComponentLifecycleEvent.UPDATED, true, null); } else { diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java index 3a8811df97..3dc293b70b 100644 --- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java +++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java @@ -15,6 +15,11 @@ */ package org.thingsboard.server.transport.snmp.service; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableScheduledFuture; +import com.google.common.util.concurrent.ListeningScheduledExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import lombok.Builder; @@ -32,7 +37,7 @@ import org.snmp4j.mp.MPv3; import org.snmp4j.security.SecurityModels; import org.snmp4j.security.SecurityProtocols; import org.snmp4j.security.USM; -import org.snmp4j.smi.Address; +import org.snmp4j.smi.IpAddress; import org.snmp4j.smi.OctetString; import org.snmp4j.smi.TcpAddress; import org.snmp4j.smi.UdpAddress; @@ -44,6 +49,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.thingsboard.common.util.ThingsBoardExecutors; import org.thingsboard.common.util.ThingsBoardThreadFactory; +import org.thingsboard.server.common.adaptor.JsonConverter; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.TbTransportService; import org.thingsboard.server.common.data.kv.DataType; @@ -53,11 +59,11 @@ import org.thingsboard.server.common.data.transport.snmp.SnmpMethod; import org.thingsboard.server.common.data.transport.snmp.config.RepeatingQueryingSnmpCommunicationConfig; import org.thingsboard.server.common.data.transport.snmp.config.SnmpCommunicationConfig; import org.thingsboard.server.common.transport.TransportService; -import org.thingsboard.server.common.adaptor.JsonConverter; import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.queue.util.TbSnmpTransportComponent; import org.thingsboard.server.transport.snmp.SnmpTransportContext; import org.thingsboard.server.transport.snmp.session.DeviceSessionContext; +import org.thingsboard.server.transport.snmp.session.ScheduledTask; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -71,8 +77,6 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -80,6 +84,7 @@ import java.util.stream.Collectors; @Service @Slf4j @RequiredArgsConstructor +@SuppressWarnings("UnstableApiUsage") public class SnmpTransportService implements TbTransportService, CommandResponder { private final TransportService transportService; private final PduService pduService; @@ -88,23 +93,27 @@ public class SnmpTransportService implements TbTransportService, CommandResponde @Getter private Snmp snmp; - private ScheduledExecutorService queryingExecutor; - private ExecutorService responseProcessingExecutor; + private ListeningScheduledExecutorService scheduler; + private ExecutorService executor; private final Map responseDataMappers = new EnumMap<>(SnmpCommunicationSpec.class); private final Map responseProcessors = new EnumMap<>(SnmpCommunicationSpec.class); @Value("${transport.snmp.bind_port:1620}") private Integer snmpBindPort; - @Value("${transport.snmp.response_processing.parallelism_level}") - private Integer responseProcessingParallelismLevel; + @Value("${transport.snmp.response_processing.parallelism_level:4}") + private int responseProcessingThreadPoolSize; + @Value("${transport.snmp.scheduler_thread_pool_size:4}") + private int schedulerThreadPoolSize; @Value("${transport.snmp.underlying_protocol}") private String snmpUnderlyingProtocol; + @Value("${transport.snmp.request_chunk_delay_ms:100}") + private int requestChunkDelayMs; @PostConstruct private void init() throws IOException { - queryingExecutor = Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors(), ThingsBoardThreadFactory.forName("snmp-querying")); - responseProcessingExecutor = ThingsBoardExecutors.newWorkStealingPool(responseProcessingParallelismLevel, "snmp-response-processing"); + scheduler = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(schedulerThreadPoolSize, ThingsBoardThreadFactory.forName("snmp-querying"))); + executor = ThingsBoardExecutors.newWorkStealingPool(responseProcessingThreadPoolSize, "snmp-response-processing"); initializeSnmp(); configureResponseDataMappers(); @@ -115,11 +124,11 @@ public class SnmpTransportService implements TbTransportService, CommandResponde @PreDestroy public void stop() { - if (queryingExecutor != null) { - queryingExecutor.shutdownNow(); + if (scheduler != null) { + scheduler.shutdownNow(); } - if (responseProcessingExecutor != null) { - responseProcessingExecutor.shutdownNow(); + if (executor != null) { + executor.shutdownNow(); } } @@ -144,38 +153,39 @@ public class SnmpTransportService implements TbTransportService, CommandResponde } public void createQueryingTasks(DeviceSessionContext sessionContext) { - List> queryingTasks = sessionContext.getProfileTransportConfiguration().getCommunicationConfigs().stream() + sessionContext.getProfileTransportConfiguration().getCommunicationConfigs().stream() .filter(communicationConfig -> communicationConfig instanceof RepeatingQueryingSnmpCommunicationConfig) - .map(config -> { + .forEach(config -> { RepeatingQueryingSnmpCommunicationConfig repeatingCommunicationConfig = (RepeatingQueryingSnmpCommunicationConfig) config; Long queryingFrequency = repeatingCommunicationConfig.getQueryingFrequencyMs(); - return queryingExecutor.scheduleWithFixedDelay(() -> { + ScheduledTask scheduledTask = new ScheduledTask(); + scheduledTask.init(() -> { try { if (sessionContext.isActive()) { - sendRequest(sessionContext, repeatingCommunicationConfig); + return sendRequest(sessionContext, repeatingCommunicationConfig); } } catch (Exception e) { log.error("Failed to send SNMP request for device {}: {}", sessionContext.getDeviceId(), e.toString()); transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), config.getSpec().getLabel(), e); } - }, queryingFrequency, queryingFrequency, TimeUnit.MILLISECONDS); - }) - .collect(Collectors.toList()); - sessionContext.getQueryingTasks().addAll(queryingTasks); + return Futures.immediateVoidFuture(); + }, queryingFrequency, scheduler); + sessionContext.getQueryingTasks().add(scheduledTask); + }); } public void cancelQueryingTasks(DeviceSessionContext sessionContext) { - sessionContext.getQueryingTasks().forEach(task -> task.cancel(true)); + sessionContext.getQueryingTasks().forEach(ScheduledTask::cancel); sessionContext.getQueryingTasks().clear(); } - private void sendRequest(DeviceSessionContext sessionContext, SnmpCommunicationConfig communicationConfig) { - sendRequest(sessionContext, communicationConfig, Collections.emptyMap()); + private ListenableFuture sendRequest(DeviceSessionContext sessionContext, SnmpCommunicationConfig communicationConfig) { + return sendRequest(sessionContext, communicationConfig, Collections.emptyMap()); } - private void sendRequest(DeviceSessionContext sessionContext, SnmpCommunicationConfig communicationConfig, Map values) { + private ListenableFuture sendRequest(DeviceSessionContext sessionContext, SnmpCommunicationConfig communicationConfig, Map values) { List request = pduService.createPdus(sessionContext, communicationConfig, values); RequestContext requestContext = RequestContext.builder() .communicationSpec(communicationConfig.getSpec()) @@ -183,19 +193,40 @@ public class SnmpTransportService implements TbTransportService, CommandResponde .responseMappings(communicationConfig.getAllMappings()) .requestSize(request.size()) .build(); - sendRequest(sessionContext, request, requestContext); + return sendRequest(sessionContext, request, requestContext); } - private void sendRequest(DeviceSessionContext sessionContext, List request, RequestContext requestContext) { - for (PDU pdu : request) { - log.debug("Executing SNMP request for device {} with {} variable bindings", sessionContext.getDeviceId(), pdu.size()); - try { - snmp.send(pdu, sessionContext.getTarget(), requestContext, sessionContext); - } catch (IOException e) { - log.error("Failed to send SNMP request to device {}: {}", sessionContext.getDeviceId(), e.toString()); - transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), requestContext.getCommunicationSpec().getLabel(), e); + private ListenableFuture sendRequest(DeviceSessionContext sessionContext, List request, RequestContext requestContext) { + if (request.size() <= 1 || requestChunkDelayMs == 0) { + for (PDU pdu : request) { + sendPdu(pdu, requestContext, sessionContext); + } + return Futures.immediateVoidFuture(); + } + + List> futures = new ArrayList<>(); + for (int i = 0, delay = 0; i < request.size(); i++, delay += requestChunkDelayMs) { + PDU pdu = request.get(i); + if (delay == 0) { + sendPdu(pdu, requestContext, sessionContext); + } else { + ListenableScheduledFuture future = scheduler.schedule(() -> { + sendPdu(pdu, requestContext, sessionContext); + }, delay, TimeUnit.MILLISECONDS); + futures.add(future); } } + return Futures.whenAllComplete(futures).call(() -> null, MoreExecutors.directExecutor()); + } + + private void sendPdu(PDU pdu, RequestContext requestContext, DeviceSessionContext sessionContext) { + log.debug("[{}] Sending SNMP request with {} variable bindings to {}", sessionContext.getDeviceId(), pdu.size(), sessionContext.getTarget().getAddress()); + try { + snmp.send(pdu, sessionContext.getTarget(), requestContext, sessionContext); + } catch (Exception e) { + log.error("[{}] Failed to send SNMP request", sessionContext.getDeviceId(), e); + transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), requestContext.getCommunicationSpec().getLabel(), e); + } } public void onAttributeUpdate(DeviceSessionContext sessionContext, TransportProtos.AttributeUpdateNotificationMsg attributeUpdateNotification) { @@ -251,21 +282,19 @@ public class SnmpTransportService implements TbTransportService, CommandResponde ((Snmp) event.getSource()).cancel(event.getRequest(), sessionContext); RequestContext requestContext = (RequestContext) event.getUserObject(); if (event.getError() != null) { - log.warn("SNMP response error: {}", event.getError().toString()); + log.warn("[{}] SNMP response error: {}", sessionContext.getDeviceId(), event.getError().toString()); transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), requestContext.getCommunicationSpec().getLabel(), new RuntimeException(event.getError())); return; } PDU responsePdu = event.getResponse(); - if (log.isTraceEnabled()) { - log.trace("Received PDU for device {}: {}", sessionContext.getDeviceId(), responsePdu); - } + log.trace("[{}] Received PDU: {}", sessionContext.getDeviceId(), responsePdu); List response; if (requestContext.getRequestSize() == 1) { if (responsePdu == null) { - log.debug("No response from SNMP device {}, requestId: {}", sessionContext.getDeviceId(), event.getRequest().getRequestID()); if (requestContext.getMethod() == SnmpMethod.GET) { + log.debug("[{}][{}] Empty response from device", sessionContext.getDeviceId(), event.getRequest().getRequestID()); transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), requestContext.getCommunicationSpec().getLabel(), new RuntimeException("No response from device")); } return; @@ -281,14 +310,14 @@ public class SnmpTransportService implements TbTransportService, CommandResponde response.add(responsePart); } } - log.debug("All response parts are collected for request to device {}", sessionContext.getDeviceId()); + log.debug("[{}] All {} response parts are collected for request", sessionContext.getDeviceId(), responseParts.size()); } else { - log.trace("Awaiting other response parts for request to device {}", sessionContext.getDeviceId()); + log.trace("[{}] Awaiting other response parts for request", sessionContext.getDeviceId()); return; } } - responseProcessingExecutor.execute(() -> { + executor.execute(() -> { try { processResponse(sessionContext, response, requestContext); } catch (Exception e) { @@ -298,24 +327,31 @@ public class SnmpTransportService implements TbTransportService, CommandResponde } /* - * SNMP notifications handler - * - * TODO: add check for host uniqueness when saving device (for backward compatibility - only for the ones using from-device RPC requests) - * - * NOTE: SNMP TRAPs support won't work properly when there is more than one SNMP transport, - * due to load-balancing of requests from devices: session might not be on this instance - * */ + * SNMP notifications handler + * + * TODO: add check for host uniqueness when saving device (for backward compatibility - only for the ones using from-device RPC requests) + * + * NOTE: SNMP TRAPs support won't work properly when there is more than one SNMP transport, + * due to load-balancing of requests from devices: session might not be on this instance + * */ @Override public void processPdu(CommandResponderEvent event) { - Address sourceAddress = event.getPeerAddress(); - DeviceSessionContext sessionContext = transportContext.getSessions().stream() - .filter(session -> session.getTarget().getAddress().equals(sourceAddress)) - .findFirst().orElse(null); - if (sessionContext == null) { - log.warn("SNMP TRAP processing failed: couldn't find device session for address {}", sourceAddress); + IpAddress sourceAddress = (IpAddress) event.getPeerAddress(); + List sessions = transportContext.getSessions().stream() + .filter(session -> ((IpAddress) session.getTarget().getAddress()).getInetAddress().equals(sourceAddress.getInetAddress())) + .collect(Collectors.toList()); + if (sessions.isEmpty()) { + log.warn("Couldn't find device session for SNMP TRAP for address {}", sourceAddress); + return; + } else if (sessions.size() > 1) { + for (DeviceSessionContext sessionContext : sessions) { + transportService.errorEvent(sessionContext.getTenantId(), sessionContext.getDeviceId(), SnmpCommunicationSpec.TO_SERVER_RPC_REQUEST.getLabel(), + new IllegalStateException("Found multiple devices for host " + sourceAddress.getInetAddress().getHostAddress())); + } return; } + DeviceSessionContext sessionContext = sessions.get(0); try { processIncomingTrap(sessionContext, event); } catch (Throwable e) { @@ -327,11 +363,11 @@ public class SnmpTransportService implements TbTransportService, CommandResponde private void processIncomingTrap(DeviceSessionContext sessionContext, CommandResponderEvent event) { PDU pdu = event.getPDU(); if (pdu == null) { - log.warn("Got empty trap from device {}", sessionContext.getDeviceId()); + log.warn("[{}] Received empty SNMP trap", sessionContext.getDeviceId()); throw new IllegalArgumentException("Received TRAP with no data"); } - log.debug("Processing SNMP trap from device {} (PDU: {}}", sessionContext.getDeviceId(), pdu); + log.debug("[{}] Processing SNMP trap: {}", sessionContext.getDeviceId(), pdu); SnmpCommunicationConfig communicationConfig = sessionContext.getProfileTransportConfiguration().getCommunicationConfigs().stream() .filter(config -> config.getSpec() == SnmpCommunicationSpec.TO_SERVER_RPC_REQUEST).findFirst() .orElseThrow(() -> new IllegalArgumentException("No config found for to-server RPC requests")); @@ -341,7 +377,7 @@ public class SnmpTransportService implements TbTransportService, CommandResponde .method(SnmpMethod.TRAP) .build(); - responseProcessingExecutor.execute(() -> { + executor.execute(() -> { processResponse(sessionContext, List.of(pdu), requestContext); }); } @@ -352,7 +388,7 @@ public class SnmpTransportService implements TbTransportService, CommandResponde JsonObject responseData = responseDataMappers.get(requestContext.getCommunicationSpec()).map(response, requestContext); if (responseData.size() == 0) { - log.warn("No values in the SNMP response for device {}", sessionContext.getDeviceId()); + log.warn("[{}] No values in the response", sessionContext.getDeviceId()); throw new IllegalArgumentException("No values in the response"); } @@ -428,11 +464,11 @@ public class SnmpTransportService implements TbTransportService, CommandResponde @PreDestroy public void shutdown() { log.info("Stopping SNMP transport!"); - if (queryingExecutor != null) { - queryingExecutor.shutdownNow(); + if (scheduler != null) { + scheduler.shutdownNow(); } - if (responseProcessingExecutor != null) { - responseProcessingExecutor.shutdownNow(); + if (executor != null) { + executor.shutdownNow(); } if (snmp != null) { try { diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/DeviceSessionContext.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/DeviceSessionContext.java index 5819c76f74..8ec0c6841d 100644 --- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/DeviceSessionContext.java +++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/DeviceSessionContext.java @@ -45,7 +45,6 @@ import org.thingsboard.server.transport.snmp.SnmpTransportContext; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; @Slf4j @@ -60,7 +59,8 @@ public class DeviceSessionContext extends DeviceAwareSessionContext implements S @Setter private SnmpDeviceTransportConfiguration deviceTransportConfiguration; @Getter - private final Device device; + @Setter + private Device device; @Getter private final TenantId tenantId; @@ -73,7 +73,7 @@ public class DeviceSessionContext extends DeviceAwareSessionContext implements S private Runnable sessionTimeoutHandler; @Getter - private final List> queryingTasks = new LinkedList<>(); + private final List queryingTasks = new LinkedList<>(); @Builder public DeviceSessionContext(TenantId tenantId, Device device, DeviceProfile deviceProfile, String token, diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/ScheduledTask.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/ScheduledTask.java new file mode 100644 index 0000000000..43d83e5e2c --- /dev/null +++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/session/ScheduledTask.java @@ -0,0 +1,62 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.transport.snmp.session; + +import com.google.common.util.concurrent.AsyncCallable; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +@Data +@Slf4j +public class ScheduledTask { + private ListenableFuture scheduledFuture; + private boolean stopped = false; + + public void init(AsyncCallable task, long delayMs, ScheduledExecutorService scheduler) { + schedule(task, delayMs, scheduler); + } + + private void schedule(AsyncCallable task, long delayMs, ScheduledExecutorService scheduler) { + scheduledFuture = Futures.scheduleAsync(() -> { + if (stopped) { + return Futures.immediateCancelledFuture(); + } + try { + return task.call(); + } catch (Throwable t) { + log.error("Unhandled error in scheduled task", t); + return Futures.immediateFailedFuture(t); + } + }, delayMs, TimeUnit.MILLISECONDS, scheduler); + if (!stopped) { + scheduledFuture.addListener(() -> schedule(task, delayMs, scheduler), MoreExecutors.directExecutor()); + } + } + + public void cancel() { + stopped = true; + if (scheduledFuture != null) { + scheduledFuture.cancel(true); + } + } + +} diff --git a/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpDeviceSimulatorV2.java b/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpDeviceSimulatorV2.java index 261e67bac8..ced8f21288 100644 --- a/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpDeviceSimulatorV2.java +++ b/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpDeviceSimulatorV2.java @@ -58,11 +58,10 @@ public class SnmpDeviceSimulatorV2 extends BaseAgent { private final Target target; private final Address address; + private final Map mappings; private Snmp snmp; - private final String password; - - public SnmpDeviceSimulatorV2(int port, String password) throws IOException { + public SnmpDeviceSimulatorV2(int port, String password, Map mappings) throws IOException { super(new File("conf.agent"), new File("bootCounter.agent"), new CommandProcessor(new OctetString("12312"))); CommunityTarget target = new CommunityTarget(); target.setCommunity(new OctetString(password)); @@ -72,7 +71,7 @@ public class SnmpDeviceSimulatorV2 extends BaseAgent { target.setTimeout(1500); target.setVersion(SnmpConstants.version2c); this.target = target; - this.password = password; + this.mappings = mappings; } public void start() throws IOException { @@ -85,13 +84,6 @@ public class SnmpDeviceSimulatorV2 extends BaseAgent { snmp = new Snmp(transportMappings[0]); } - public void setUpMappings(Map oidToResponseMappings) { - unregisterManagedObject(getSnmpv2MIB()); - oidToResponseMappings.forEach((oid, response) -> { - registerManagedObject(new MOScalar<>(new OID(oid), MOAccessImpl.ACCESS_READ_WRITE, new OctetString(response))); - }); - } - public void sendTrap(String host, int port, Map values) throws IOException { PDU pdu = new PDU(); pdu.addAll(values.entrySet().stream() @@ -107,6 +99,10 @@ public class SnmpDeviceSimulatorV2 extends BaseAgent { @Override protected void registerManagedObjects() { + unregisterManagedObject(getSnmpv2MIB()); + mappings.forEach((oid, response) -> { + registerManagedObject(new MOScalar<>(new OID(oid), MOAccessImpl.ACCESS_READ_WRITE, new OctetString(response))); + }); } protected void registerManagedObject(ManagedObject mo) { @@ -152,6 +148,7 @@ public class SnmpDeviceSimulatorV2 extends BaseAgent { } protected void unregisterManagedObjects() { + unregisterManagedObject(getSnmpv2MIB()); } protected void addCommunities(SnmpCommunityMIB communityMIB) { diff --git a/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpTestV2.java b/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpTestV2.java index cb99c85655..c87507f962 100644 --- a/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpTestV2.java +++ b/common/transport/snmp/src/test/java/org/thingsboard/server/transport/snmp/SnmpTestV2.java @@ -15,28 +15,34 @@ */ package org.thingsboard.server.transport.snmp; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import org.thingsboard.common.util.JacksonUtil; + +import java.io.File; import java.io.IOException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Scanner; +import java.util.stream.Collectors; public class SnmpTestV2 { private static final Scanner scanner = new Scanner(System.in); public static void main(String[] args) throws IOException { - SnmpDeviceSimulatorV2 client = new SnmpDeviceSimulatorV2(1610, "public"); + Map mappings = new LinkedHashMap<>(); + for (int i = 1; i <= 50; i++) { + String oid = String.format("1.3.6.1.2.1.%s.1.52", i); + mappings.put(oid, "value_" + i); + } - client.start(); - Map mappings = new HashMap<>(); -// for (int i = 1; i <= 500; i++) { -// String oid = String.format(".1.3.6.1.2.1.%s.1.52", i); -// mappings.put(oid, "value_" + i); -// } - mappings.put("1.3.6.1.2.1.266.1.52", "****"); + SnmpDeviceSimulatorV2 device = new SnmpDeviceSimulatorV2(1610, "public", mappings); + device.start(); - client.setUpMappings(mappings); - inputTraps(client); + System.out.println("Hosting the following values:\n" + mappings.entrySet().stream() + .map(entry -> entry.getKey() + " - " + entry.getValue()) + .collect(Collectors.joining("\n"))); scanner.nextLine(); } @@ -53,4 +59,18 @@ public class SnmpTestV2 { } } + private static void updateDeviceProfile(String file) throws Exception { + File profileFile = new File(file); + JsonNode deviceProfile = JacksonUtil.OBJECT_MAPPER.readTree(profileFile); + ArrayNode mappingsJson = (ArrayNode) deviceProfile.at("/profileData/transportConfiguration/communicationConfigs/0/mappings"); + for (int i = 1; i <= 50; i++) { + String oid = String.format(".1.3.6.1.2.1.%s.1.52", i); + mappingsJson.add(JacksonUtil.newObjectNode() + .put("oid", oid) + .put("key", "key_" + i) + .put("dataType", "STRING")); + } + JacksonUtil.OBJECT_MAPPER.writeValue(profileFile, deviceProfile); + } + } diff --git a/common/transport/snmp/src/test/resources/snmp-device-profile-transport-config.json b/common/transport/snmp/src/test/resources/snmp-device-profile-transport-config.json deleted file mode 100644 index f74ebca0bf..0000000000 --- a/common/transport/snmp/src/test/resources/snmp-device-profile-transport-config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "timeoutMs": 500, - "retries": 0, - "communicationConfigs": [ - { - "spec": "TELEMETRY_QUERYING", - "queryingFrequencyMs": 3000, - "mappings": [ - { - "oid": ".1.3.6.1.2.1.1.1.50", - "key": "temperature", - "dataType": "LONG" - }, - { - "oid": ".1.3.6.1.2.1.2.1.52", - "key": "humidity", - "dataType": "DOUBLE" - } - ] - }, - { - "spec": "CLIENT_ATTRIBUTES_QUERYING", - "queryingFrequencyMs": 5000, - "mappings": [ - { - "oid": ".1.3.6.1.2.1.3.1.54", - "key": "isCool", - "dataType": "STRING" - } - ] - }, - { - "spec": "SHARED_ATTRIBUTES_SETTING", - "mappings": [ - { - "oid": ".1.3.6.1.2.1.7.1.58", - "key": "shared", - "dataType": "STRING" - } - ] - } - ] -} diff --git a/common/transport/snmp/src/test/resources/snmp-device-transport-config-v3.json b/common/transport/snmp/src/test/resources/snmp-device-transport-config-v3.json deleted file mode 100644 index 039e03fa53..0000000000 --- a/common/transport/snmp/src/test/resources/snmp-device-transport-config-v3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "address": "192.168.3.23", - "port": 1610, - "protocolVersion": "V3", - - "username": "tb-user", - "engineId": "qwertyuioa", - "securityName": "tb-user", - "authenticationProtocol": "SHA_512", - "authenticationPassphrase": "sdfghjkloifgh", - "privacyProtocol": "DES", - "privacyPassphrase": "rtytguijokod" -} \ No newline at end of file diff --git a/common/transport/snmp/src/test/resources/snmp-device-transport-config.json b/common/transport/snmp/src/test/resources/snmp-device-transport-config.json deleted file mode 100644 index c73d817bfb..0000000000 --- a/common/transport/snmp/src/test/resources/snmp-device-transport-config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "address": "127.0.0.1", - "port": 1610, - "community": "public", - "protocolVersion": "V2C" -} \ No newline at end of file diff --git a/common/transport/snmp/src/test/resources/snmp_device_profile.json b/common/transport/snmp/src/test/resources/snmp_device_profile.json new file mode 100644 index 0000000000..0e72c46ce8 --- /dev/null +++ b/common/transport/snmp/src/test/resources/snmp_device_profile.json @@ -0,0 +1,289 @@ +{ + "name": "SNMP Device Profile", + "description": "", + "image": null, + "type": "DEFAULT", + "transportType": "SNMP", + "provisionType": "DISABLED", + "defaultRuleChainId": null, + "defaultDashboardId": null, + "defaultQueueName": null, + "profileData": { + "configuration": { + "type": "DEFAULT" + }, + "transportConfiguration": { + "type": "SNMP", + "timeoutMs": 500, + "retries": 0, + "communicationConfigs": [ + { + "spec": "TELEMETRY_QUERYING", + "mappings": [ + { + "oid": ".1.3.6.1.2.1.1.1.52", + "key": "key_1", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.2.1.52", + "key": "key_2", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.3.1.52", + "key": "key_3", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.4.1.52", + "key": "key_4", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.5.1.52", + "key": "key_5", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.6.1.52", + "key": "key_6", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.7.1.52", + "key": "key_7", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.8.1.52", + "key": "key_8", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.9.1.52", + "key": "key_9", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.10.1.52", + "key": "key_10", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.11.1.52", + "key": "key_11", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.12.1.52", + "key": "key_12", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.13.1.52", + "key": "key_13", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.14.1.52", + "key": "key_14", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.15.1.52", + "key": "key_15", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.16.1.52", + "key": "key_16", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.17.1.52", + "key": "key_17", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.18.1.52", + "key": "key_18", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.19.1.52", + "key": "key_19", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.20.1.52", + "key": "key_20", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.21.1.52", + "key": "key_21", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.22.1.52", + "key": "key_22", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.23.1.52", + "key": "key_23", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.24.1.52", + "key": "key_24", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.25.1.52", + "key": "key_25", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.26.1.52", + "key": "key_26", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.27.1.52", + "key": "key_27", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.28.1.52", + "key": "key_28", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.29.1.52", + "key": "key_29", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.30.1.52", + "key": "key_30", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.31.1.52", + "key": "key_31", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.32.1.52", + "key": "key_32", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.33.1.52", + "key": "key_33", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.34.1.52", + "key": "key_34", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.35.1.52", + "key": "key_35", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.36.1.52", + "key": "key_36", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.37.1.52", + "key": "key_37", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.38.1.52", + "key": "key_38", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.39.1.52", + "key": "key_39", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.40.1.52", + "key": "key_40", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.41.1.52", + "key": "key_41", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.42.1.52", + "key": "key_42", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.43.1.52", + "key": "key_43", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.44.1.52", + "key": "key_44", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.45.1.52", + "key": "key_45", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.46.1.52", + "key": "key_46", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.47.1.52", + "key": "key_47", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.48.1.52", + "key": "key_48", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.49.1.52", + "key": "key_49", + "dataType": "STRING" + }, + { + "oid": ".1.3.6.1.2.1.50.1.52", + "key": "key_50", + "dataType": "STRING" + } + ], + "queryingFrequencyMs": 5000 + } + ] + }, + "provisionConfiguration": { + "type": "DISABLED", + "provisionDeviceSecret": null + }, + "alarms": null + }, + "provisionDeviceKey": null, + "firmwareId": null, + "softwareId": null, + "defaultEdgeRuleChainId": null, + "default": false +} \ No newline at end of file diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java index 0d7fbfc332..4aa989ed25 100644 --- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java +++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java @@ -788,7 +788,11 @@ public class DefaultTransportService extends TransportActivityManager implements .setSuccess(success) .setError(error != null ? ExceptionUtils.getStackTrace(error) : "")) .build(); - sendToCore(tenantId, deviceId, msg, deviceId.getId(), TransportServiceCallback.EMPTY); + try { + sendToCore(tenantId, deviceId, msg, deviceId.getId(), TransportServiceCallback.EMPTY); + } catch (Exception e) { + log.error("[{}][{}] Failed to send lifecycle event to core", tenantId, deviceId, e); + } } @Override @@ -801,9 +805,13 @@ public class DefaultTransportService extends TransportActivityManager implements .setEntityIdLSB(deviceId.getId().getLeastSignificantBits()) .setServiceId(serviceInfoProvider.getServiceId()) .setMethod(method) - .setError(ExceptionUtils.getStackTrace(error))) + .setError(ExceptionUtils.getRootCauseMessage(error))) .build(); - sendToCore(tenantId, deviceId, msg, deviceId.getId(), TransportServiceCallback.EMPTY); + try { + sendToCore(tenantId, deviceId, msg, deviceId.getId(), TransportServiceCallback.EMPTY); + } catch (Exception e) { + log.error("[{}][{}] Failed to send error event to core", tenantId, deviceId, e); + } } @Override @@ -985,10 +993,10 @@ public class DefaultTransportService extends TransportActivityManager implements log.warn("ResourceDelete - [{}] [{}]", id, mdRez); transportCallbackExecutor.submit(() -> mdRez.getListener().onResourceDelete(msg)); }); - } else if (toSessionMsg.hasQueueUpdateMsg()) { - partitionService.updateQueue(toSessionMsg.getQueueUpdateMsg()); - } else if (toSessionMsg.hasQueueDeleteMsg()) { - partitionService.removeQueue(toSessionMsg.getQueueDeleteMsg()); + } else if (toSessionMsg.getQueueUpdateMsgsCount() > 0) { + partitionService.updateQueues(toSessionMsg.getQueueUpdateMsgsList()); + } else if (toSessionMsg.getQueueDeleteMsgsCount() > 0) { + partitionService.removeQueues(toSessionMsg.getQueueDeleteMsgsList()); } else { //TODO: should we notify the device actor about missed session? log.debug("[{}] Missing session.", sessionId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java index f190923167..2f7fe0680c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java @@ -157,16 +157,19 @@ public class DeviceServiceImpl extends AbstractCachedEntityService deviceDao.findDeviceByTenantIdAndName(tenantId.getId(), name).orElse(null), true); } + @Transactional @Override public Device saveDeviceWithAccessToken(Device device, String accessToken) { return doSaveDevice(device, accessToken, true); } + @Transactional @Override public Device saveDevice(Device device, boolean doValidate) { return doSaveDevice(device, null, doValidate); } + @Transactional @Override public Device saveDevice(Device device) { return doSaveDevice(device, null, true); diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java index 9ea70f6c5a..4d1e126c49 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java @@ -19,11 +19,15 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.thingsboard.server.cache.limits.RateLimitService; +import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.edge.EdgeEvent; import org.thingsboard.server.common.data.id.EdgeId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.limit.LimitedApi; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.common.msg.tools.TbRateLimitsException; import org.thingsboard.server.dao.service.DataValidator; @Service @@ -32,11 +36,17 @@ import org.thingsboard.server.dao.service.DataValidator; public class BaseEdgeEventService implements EdgeEventService { private final EdgeEventDao edgeEventDao; - + private final RateLimitService rateLimitService; private final DataValidator edgeEventValidator; @Override public ListenableFuture saveAsync(EdgeEvent edgeEvent) { + if (!rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS, edgeEvent.getTenantId())) { + throw new TbRateLimitsException(EntityType.TENANT); + } + if (!rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS_PER_EDGE, edgeEvent.getTenantId(), edgeEvent.getEdgeId())) { + throw new TbRateLimitsException(EntityType.EDGE); + } edgeEventValidator.validate(edgeEvent, EdgeEvent::getTenantId); return edgeEventDao.saveAsync(edgeEvent); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java index 80eea0a478..136fd0485d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java @@ -30,10 +30,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.event.TransactionalEventListener; import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.EntitySubtype; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.StringUtils; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.edge.Edge; @@ -48,14 +48,15 @@ import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantProfileId; import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.page.PageData; -import org.thingsboard.server.common.data.page.PageDataIterable; import org.thingsboard.server.common.data.page.PageDataIterableByTenantIdEntityId; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntitySearchDirection; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.entity.AbstractCachedEntityService; import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent; import org.thingsboard.server.dao.exception.DataValidationException; @@ -64,7 +65,7 @@ import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.service.Validator; -import org.thingsboard.server.dao.tenant.TenantService; +import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.dao.user.UserService; import javax.annotation.Nullable; @@ -105,7 +106,10 @@ public class EdgeServiceImpl extends AbstractCachedEntityService edgeValidator; @@ -113,6 +117,8 @@ public class EdgeServiceImpl extends AbstractCachedEntityService isEdgeActiveAsync(TenantId tenantId, EdgeId edgeId, String key) { + ListenableFuture> futureKvEntry; + if (persistToTelemetry) { + futureKvEntry = timeseriesService.findLatest(tenantId, edgeId, key); + } else { + futureKvEntry = attributesService.find(tenantId, edgeId, DataConstants.SERVER_SCOPE, key); + } + return Futures.transformAsync(futureKvEntry, kvEntryOpt -> + Futures.immediateFuture(kvEntryOpt.flatMap(KvEntry::getBooleanValue).orElse(false)), MoreExecutors.directExecutor()); + } + private List findEdgeRuleChains(TenantId tenantId, EdgeId edgeId) { List result = new ArrayList<>(); PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE); diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java index 23d4245575..e569745504 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java @@ -27,7 +27,7 @@ import org.thingsboard.server.dao.entity.EntityService; import org.thingsboard.server.dao.util.AbstractBufferedRateExecutor; import org.thingsboard.server.dao.util.AsyncTaskContext; import org.thingsboard.server.dao.util.NoSqlAnyDao; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import javax.annotation.PreDestroy; diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java index 822768c572..59fdcac935 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java @@ -27,7 +27,7 @@ import org.thingsboard.server.dao.entity.EntityService; import org.thingsboard.server.dao.util.AbstractBufferedRateExecutor; import org.thingsboard.server.dao.util.AsyncTaskContext; import org.thingsboard.server.dao.util.NoSqlAnyDao; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import javax.annotation.PreDestroy; diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java index 59787a01a7..c858eecf62 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java @@ -41,6 +41,7 @@ import org.thingsboard.server.common.data.notification.targets.platform.SystemAd import org.thingsboard.server.common.data.notification.targets.platform.TenantAdministratorsFilter; import org.thingsboard.server.common.data.notification.targets.platform.UsersFilter; import org.thingsboard.server.common.data.notification.targets.platform.UsersFilterType; +import org.thingsboard.server.common.data.notification.template.NotificationTemplate; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.settings.UserSettings; import org.thingsboard.server.common.data.settings.UserSettingsType; @@ -53,6 +54,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -187,6 +189,8 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS defaultNotifications.create(tenantId, DefaultNotifications.alarmComment, tenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.alarmAssignment, affectedUser.getId()); defaultNotifications.create(tenantId, DefaultNotifications.ruleEngineComponentLifecycleFailure, tenantAdmins.getId()); + defaultNotifications.create(tenantId, DefaultNotifications.edgeConnection, tenantAdmins.getId()); + defaultNotifications.create(tenantId, DefaultNotifications.edgeCommunicationFailures, tenantAdmins.getId()); } @Override @@ -198,17 +202,43 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS } NotificationTarget sysAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.SYSTEM_ADMINISTRATORS).stream() - .findFirst().orElseGet(() -> { - return createTarget(tenantId, "System administrators", new SystemAdministratorsFilter(), "All system administrators"); - }); + .findFirst().orElseGet(() -> createTarget(tenantId, "System administrators", new SystemAdministratorsFilter(), "All system administrators")); NotificationTarget affectedTenantAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS).stream() - .findFirst().orElseGet(() -> { - return createTarget(tenantId, "Affected tenant's administrators", new AffectedTenantAdministratorsFilter(), ""); - }); + .findFirst().orElseGet(() -> createTarget(tenantId, "Affected tenant's administrators", new AffectedTenantAdministratorsFilter(), "")); defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId()); + } else { + var requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE); + var existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes( + tenantId, requiredNotificationTypes, new PageLink(1)) + .getData() + .stream() + .map(NotificationTemplate::getNotificationType) + .collect(Collectors.toSet()); + + if (existingNotificationTypes.containsAll(requiredNotificationTypes)) { + return; + } + + NotificationTarget tenantAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.TENANT_ADMINISTRATORS) + .stream() + .findFirst() + .orElseGet(() -> createTarget(tenantId, "Tenant administrators", new TenantAdministratorsFilter(), "Tenant administrators")); + + for (NotificationType type : requiredNotificationTypes) { + if (!existingNotificationTypes.contains(type)) { + switch (type) { + case EDGE_CONNECTION: + defaultNotifications.create(tenantId, DefaultNotifications.edgeConnection, tenantAdmins.getId()); + break; + case EDGE_COMMUNICATION_FAILURE: + defaultNotifications.create(tenantId, DefaultNotifications.edgeCommunicationFailures, tenantAdmins.getId()); + break; + } + } + } } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java index 5a78fa9864..fd17618bd1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java @@ -40,6 +40,9 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Alarm import org.thingsboard.server.common.data.notification.rule.trigger.config.ApiUsageLimitNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.DeviceActivityNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.DeviceActivityNotificationRuleTriggerConfig.DeviceEvent; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeCommunicationFailureNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig; +import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeConnectionNotificationRuleTriggerConfig.EdgeConnectivityEvent; import org.thingsboard.server.common.data.notification.rule.trigger.config.EntitiesLimitNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.EntityActionNotificationRuleTriggerConfig; import org.thingsboard.server.common.data.notification.rule.trigger.config.NewPlatformVersionNotificationRuleTriggerConfig; @@ -325,6 +328,35 @@ public class DefaultNotifications { .description("Send notification to tenant admins when any Rule chain or Rule node failed to start, update or stop") .build()) .build(); + public static final DefaultNotification edgeConnection = DefaultNotification.builder() + .name("Edge connection notification") + .type(NotificationType.EDGE_CONNECTION) + .subject("Edge connection status change") + .text("Edge '${edgeName}' is now ${eventType}") + .icon("info").color(null) + .button("Go to Edge").link("/edgeManagement/instances/${edgeId}") + .rule(DefaultRule.builder() + .name("Edge connection status change") + .triggerConfig(EdgeConnectionNotificationRuleTriggerConfig.builder() + .edges(null) + .notifyOn(Set.of(EdgeConnectivityEvent.CONNECTED, EdgeConnectivityEvent.DISCONNECTED)) + .build()) + .description("Send notification to tenant admins when the connection status between TB and Edge changes") + .build()) + .build(); + public static final DefaultNotification edgeCommunicationFailures = DefaultNotification.builder() + .name("Edge communication failure notification") + .type(NotificationType.EDGE_COMMUNICATION_FAILURE) + .subject("Edge '${edgeName}' communication failure occurred") + .text("Failure message: '${failureMsg}'") + .icon("error").color(RED_COLOR) + .button("Go to Edge").link("/edgeManagement/instances/${edgeId}") + .rule(DefaultRule.builder() + .name("Edge communication failure") + .triggerConfig(EdgeCommunicationFailureNotificationRuleTriggerConfig.builder().edges(null).build()) + .description("Send notification to tenant admins when communication failures occur") + .build()) + .build(); public static final DefaultNotification jwtSigningKeyIssue = DefaultNotification.builder() .name("JWT Signing Key issue notification") @@ -346,7 +378,7 @@ public class DefaultNotifications { if (defaultNotification.getRule() != null && targets.length > 0) { NotificationRule rule = defaultNotification.toRule(template.getId(), targets); rule.setTenantId(tenantId); - rule = ruleService.saveNotificationRule(tenantId, rule); + ruleService.saveNotificationRule(tenantId, rule); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java index 57c45b1d0b..0755fb1526 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java @@ -57,9 +57,6 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ @Autowired private DataValidator queueValidator; -// @Autowired -// private QueueStatsService queueStatsService; - @Override public Queue saveQueue(Queue queue) { log.trace("Executing createOrUpdateQueue [{}]", queue); diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 1d1296c42e..962e0429df 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -149,6 +149,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC } @Override + @Transactional public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function ruleNodeUpdater) { Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id."); RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId()); diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/DefaultTbTenantProfileCache.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/DefaultTbTenantProfileCache.java index 4610973370..a9d118befb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/DefaultTbTenantProfileCache.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/DefaultTbTenantProfileCache.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.tenant; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.thingsboard.server.cache.limits.TenantProfileProvider; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.TenantProfile; import org.thingsboard.server.common.data.id.EntityId; @@ -31,7 +32,7 @@ import java.util.function.Consumer; @Service @Slf4j -public class DefaultTbTenantProfileCache implements TbTenantProfileCache { +public class DefaultTbTenantProfileCache implements TbTenantProfileCache, TenantProfileProvider { private final Lock tenantProfileFetchLock = new ReentrantLock(); private final TenantProfileService tenantProfileService; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index 31e29434e8..6b2ab7e07b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -65,6 +65,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -85,6 +86,18 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD public static final String ASC_ORDER = "ASC"; public static final long SECONDS_IN_DAY = TimeUnit.DAYS.toSeconds(1); protected static final List FIXED_PARTITION = List.of(0L); + protected static final String INSERT_WITH_NULL = INSERT_INTO + ModelConstants.TS_KV_CF + + "(" + ModelConstants.ENTITY_TYPE_COLUMN + + "," + ModelConstants.ENTITY_ID_COLUMN + + "," + ModelConstants.KEY_COLUMN + + "," + ModelConstants.PARTITION_COLUMN + + "," + ModelConstants.TS_COLUMN + + "," + ModelConstants.BOOLEAN_VALUE_COLUMN + + "," + ModelConstants.STRING_VALUE_COLUMN + + "," + ModelConstants.LONG_VALUE_COLUMN + + "," + ModelConstants.DOUBLE_VALUE_COLUMN + + "," + ModelConstants.JSON_VALUE_COLUMN + ")" + + " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; private CassandraTsPartitionsCache cassandraTsPartitionsCache; @@ -117,6 +130,8 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD private PreparedStatement[] fetchStmtsAsc; private PreparedStatement[] fetchStmtsDesc; private PreparedStatement deleteStmt; + private PreparedStatement saveWithNullStmt; + private PreparedStatement saveWithNullWithTtlStmt; private final Lock stmtCreationLock = new ReentrantLock(); private boolean isInstall() { @@ -159,19 +174,36 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD ttl = computeTtl(ttl); int dataPointDays = tsKvEntry.getDataPoints() * Math.max(1, (int) (ttl / SECONDS_IN_DAY)); long partition = toPartitionTs(tsKvEntry.getTs()); + String entityType = entityId.getEntityType().name(); + UUID entityIdId = entityId.getId(); + String entryKey = tsKvEntry.getKey(); + long ts = tsKvEntry.getTs(); DataType type = tsKvEntry.getDataType(); + BoundStatementBuilder stmtBuilder; if (setNullValuesEnabled) { - processSetNullValues(tenantId, entityId, tsKvEntry, ttl, futures, partition, type); - } - BoundStatementBuilder stmtBuilder = new BoundStatementBuilder((ttl == 0 ? getSaveStmt(type) : getSaveTtlStmt(type)).bind()); - stmtBuilder.setString(0, entityId.getEntityType().name()) - .setUuid(1, entityId.getId()) - .setString(2, tsKvEntry.getKey()) - .setLong(3, partition) - .setLong(4, tsKvEntry.getTs()); - addValue(tsKvEntry, stmtBuilder, 5); - if (ttl > 0) { - stmtBuilder.setInt(6, (int) ttl); + Boolean booleanValue = tsKvEntry.getBooleanValue().orElse(null); + String strValue = tsKvEntry.getStrValue().orElse(null); + Long longValue = tsKvEntry.getLongValue().orElse(null); + Double doubleValue = tsKvEntry.getDoubleValue().orElse(null); + String jsonValue = tsKvEntry.getJsonValue().orElse(null); + if (ttl == 0) { + stmtBuilder = new BoundStatementBuilder(getSaveWithNullStmt() + .bind(entityType, entityIdId, entryKey, partition, ts, booleanValue, strValue, longValue, doubleValue, jsonValue)); + } else { + stmtBuilder = new BoundStatementBuilder(getSaveWithNullWithTtlStmt() + .bind(entityType, entityIdId, entryKey, partition, ts, booleanValue, strValue, longValue, doubleValue, jsonValue, (int) ttl)); + } + } else { + stmtBuilder = new BoundStatementBuilder((ttl == 0 ? getSaveStmt(type) : getSaveTtlStmt(type)).bind()); + stmtBuilder.setString(0, entityType) + .setUuid(1, entityIdId) + .setString(2, entryKey) + .setLong(3, partition) + .setLong(4, ts); + addValue(tsKvEntry, stmtBuilder, 5); + if (ttl > 0) { + stmtBuilder.setInt(6, (int) ttl); + } } BoundStatement stmt = stmtBuilder.build(); futures.add(getFuture(executeAsyncWrite(tenantId, stmt), rs -> null)); @@ -449,56 +481,6 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD return tsFormat.getTruncateUnit().equals(ChronoUnit.FOREVER); } - private void processSetNullValues(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry, long ttl, List> futures, long partition, DataType type) { - switch (type) { - case LONG: - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.BOOLEAN)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.DOUBLE)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.STRING)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.JSON)); - break; - case BOOLEAN: - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.DOUBLE)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.LONG)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.STRING)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.JSON)); - break; - case DOUBLE: - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.BOOLEAN)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.LONG)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.STRING)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.JSON)); - break; - case STRING: - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.BOOLEAN)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.DOUBLE)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.LONG)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.JSON)); - break; - case JSON: - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.BOOLEAN)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.DOUBLE)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.LONG)); - futures.add(saveNull(tenantId, entityId, tsKvEntry, ttl, partition, DataType.STRING)); - break; - } - } - - private ListenableFuture saveNull(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry, long ttl, long partition, DataType type) { - BoundStatementBuilder stmtBuilder = new BoundStatementBuilder((ttl == 0 ? getSaveStmt(type) : getSaveTtlStmt(type)).bind()); - stmtBuilder.setString(0, entityId.getEntityType().name()) - .setUuid(1, entityId.getId()) - .setString(2, tsKvEntry.getKey()) - .setLong(3, partition) - .setLong(4, tsKvEntry.getTs()); - stmtBuilder.setToNull(getColumnName(type)); - if (ttl > 0) { - stmtBuilder.setInt(6, (int) ttl); - } - BoundStatement stmt = stmtBuilder.build(); - return getFuture(executeAsyncWrite(tenantId, stmt), rs -> null); - } - private ListenableFuture doSavePartition(TenantId tenantId, EntityId entityId, String key, long ttl, long partition) { log.debug("Saving partition {} for the entity [{}-{}] and key {}", partition, entityId.getEntityType(), entityId.getId(), key); PreparedStatement preparedStatement = ttl == 0 ? getPartitionInsertStmt() : getPartitionInsertTtlStmt(); @@ -591,6 +573,34 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD return deleteStmt; } + private PreparedStatement getSaveWithNullStmt() { + if (saveWithNullStmt == null) { + stmtCreationLock.lock(); + try { + if (saveWithNullStmt == null) { + saveWithNullStmt = prepare(INSERT_WITH_NULL); + } + } finally { + stmtCreationLock.unlock(); + } + } + return saveWithNullStmt; + } + + private PreparedStatement getSaveWithNullWithTtlStmt() { + if (saveWithNullWithTtlStmt == null) { + stmtCreationLock.lock(); + try { + if (saveWithNullWithTtlStmt == null) { + saveWithNullWithTtlStmt = prepare(INSERT_WITH_NULL + " USING TTL ?"); + } + } finally { + stmtCreationLock.unlock(); + } + } + return saveWithNullWithTtlStmt; + } + private PreparedStatement getSaveStmt(DataType dataType) { if (saveStmts == null) { stmtCreationLock.lock(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java index ebe2d59dcf..8474af9584 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java @@ -38,7 +38,7 @@ import org.thingsboard.server.common.stats.StatsType; import org.thingsboard.server.dao.entity.EntityService; import org.thingsboard.server.dao.nosql.CassandraStatementTask; import org.thingsboard.server.common.data.limit.LimitedApi; -import org.thingsboard.server.dao.util.limits.RateLimitService; +import org.thingsboard.server.cache.limits.RateLimitService; import javax.annotation.Nullable; import java.util.HashMap; diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java index b0d42cdb07..f4a77dc725 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java @@ -112,12 +112,10 @@ public class DeviceConnectivityUtil { dockerComposeBuilder.append("# - \"5026:5026\" # Modbus TCP connector (Modbus Slave)\n"); dockerComposeBuilder.append("# - \"50000:50000/tcp\" # Socket connector with type TCP\n"); dockerComposeBuilder.append("# - \"50000:50000/udp\" # Socket connector with type UDP\n"); - if (isLocalhost(host)) { - dockerComposeBuilder.append("\n"); - dockerComposeBuilder.append(" # Necessary mapping for Linux\n"); - dockerComposeBuilder.append(" extra_hosts:\n"); - dockerComposeBuilder.append(" - \"host.docker.internal:host-gateway\"\n"); - } + dockerComposeBuilder.append("\n"); + dockerComposeBuilder.append(" # Necessary mapping for Linux\n"); + dockerComposeBuilder.append(" extra_hosts:\n"); + dockerComposeBuilder.append(" - \"host.docker.internal:host-gateway\"\n"); dockerComposeBuilder.append("\n"); dockerComposeBuilder.append(" # Environment variables\n"); dockerComposeBuilder.append(" environment:\n"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java index 61d1c845fc..12bcac72f1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java @@ -16,12 +16,15 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; +import org.hibernate.exception.ConstraintViolationException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; @@ -35,8 +38,6 @@ import org.thingsboard.server.common.data.OtaPackage; import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.TenantProfile; -import org.thingsboard.server.common.data.asset.Asset; -import org.thingsboard.server.common.data.asset.AssetProfile; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.ota.ChecksumAlgorithm; @@ -50,15 +51,19 @@ import org.thingsboard.server.dao.device.DeviceCredentialsService; import org.thingsboard.server.dao.device.DeviceProfileService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException; import org.thingsboard.server.dao.ota.OtaPackageService; +import org.thingsboard.server.dao.service.validator.DeviceCredentialsDataValidator; import org.thingsboard.server.dao.tenant.TenantProfileService; import java.nio.ByteBuffer; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.List; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -79,6 +84,8 @@ public class DeviceServiceTest extends AbstractServiceTest { TenantProfileService tenantProfileService; @Autowired private PlatformTransactionManager platformTransactionManager; + @SpyBean + private DeviceCredentialsDataValidator validator; private IdComparator idComparator = new IdComparator<>(); private TenantId anotherTenantId; @@ -129,6 +136,67 @@ public class DeviceServiceTest extends AbstractServiceTest { }); } + @Test + public void testSaveDevicesWithTheSameAccessToken() { + Device device = new Device(); + device.setTenantId(tenantId); + device.setName(StringUtils.randomAlphabetic(10)); + device.setType("default"); + String accessToken = StringUtils.generateSafeToken(10); + Device savedDevice = deviceService.saveDeviceWithAccessToken(device, accessToken); + + DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, savedDevice.getId()); + Assert.assertEquals(accessToken, deviceCredentials.getCredentialsId()); + + Device duplicatedDevice = new Device(); + duplicatedDevice.setTenantId(tenantId); + duplicatedDevice.setName(StringUtils.randomAlphabetic(10)); + duplicatedDevice.setType("default"); + assertThatThrownBy(() -> deviceService.saveDeviceWithAccessToken(duplicatedDevice, accessToken)) + .isInstanceOf(DeviceCredentialsValidationException.class) + .hasMessageContaining("Device credentials are already assigned to another device!"); + + Device deviceByName = deviceService.findDeviceByTenantIdAndName(tenantId, duplicatedDevice.getName()); + Assertions.assertNull(deviceByName); + } + + @Test + public void testShouldRollbackNotValidatedDeviceIfDeviceCredentialsValidationFailed() { + Mockito.reset(validator); + Mockito.doThrow(new DataValidationException("mock message")) + .when(validator).validate(any(), any()); + + Device device = new Device(); + device.setTenantId(tenantId); + device.setName(StringUtils.randomAlphabetic(10)); + device.setType("default"); + assertThatThrownBy(() -> deviceService.saveDevice(device, false)) + .isInstanceOf(DataValidationException.class) + .hasMessageContaining("mock message"); + + Device deviceByName = deviceService.findDeviceByTenantIdAndName(tenantId, device.getName()); + Assertions.assertNull(deviceByName); + } + + @Test + public void testShouldRollbackValidatedDeviceIfDeviceCredentialsValidationFailed() { + Mockito.reset(validator); + Mockito.doThrow(new DataValidationException("mock message")) + .when(validator).validate(any(), any()); + + Device device = new Device(); + device.setTenantId(tenantId); + device.setName(StringUtils.randomAlphabetic(10)); + device.setType("default"); + + assertThatThrownBy(() -> deviceService.saveDevice(device)) + .isInstanceOf(DataValidationException.class) + .hasMessageContaining("mock message"); + + Device deviceByName = deviceService.findDeviceByTenantIdAndName(tenantId, device.getName()); + Assertions.assertNull(deviceByName); + } + @Test public void testCountByTenantId() { Assert.assertEquals(0, deviceService.countByTenantId(tenantId)); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java index 2a03a1277c..2cc179fae2 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java @@ -40,7 +40,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT; +import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT; @DaoSqlTest public class EdgeEventServiceTest extends AbstractServiceTest { @@ -56,19 +56,18 @@ public class EdgeEventServiceTest extends AbstractServiceTest { @Before public void before() throws ParseException { - timeBeforeStartTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T11:30:00Z").getTime(); - startTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:00:00Z").getTime(); - eventTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:30:00Z").getTime(); - endTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:00:00Z").getTime(); - timeAfterEndTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:30:30Z").getTime(); + timeBeforeStartTime = ISO_8601_EXTENDED_DATETIME_FORMAT.parse("2016-11-01T11:30:00").getTime(); + startTime = ISO_8601_EXTENDED_DATETIME_FORMAT.parse("2016-11-01T12:00:00").getTime(); + eventTime = ISO_8601_EXTENDED_DATETIME_FORMAT.parse("2016-11-01T12:30:00").getTime(); + endTime = ISO_8601_EXTENDED_DATETIME_FORMAT.parse("2016-11-01T13:00:00").getTime(); + timeAfterEndTime = ISO_8601_EXTENDED_DATETIME_FORMAT.parse("2016-11-01T13:30:30").getTime(); } @Test public void saveEdgeEvent() throws Exception { EdgeId edgeId = new EdgeId(Uuids.timeBased()); DeviceId deviceId = new DeviceId(Uuids.timeBased()); - TenantId tenantId = new TenantId(Uuids.timeBased()); - EdgeEvent edgeEvent = generateEdgeEvent(tenantId, edgeId, deviceId, EdgeEventActionType.ADDED); + EdgeEvent edgeEvent = generateEdgeEvent(tenantId, edgeId, deviceId); edgeEventService.saveAsync(edgeEvent).get(); PageData edgeEvents = edgeEventService.findEdgeEvents(tenantId, edgeId, 0L, null, new TimePageLink(1)); @@ -81,9 +80,11 @@ public class EdgeEventServiceTest extends AbstractServiceTest { Assert.assertEquals(saved.getType(), edgeEvent.getType()); Assert.assertEquals(saved.getAction(), edgeEvent.getAction()); Assert.assertEquals(saved.getBody(), edgeEvent.getBody()); + + edgeEventService.cleanupEvents(1); } - protected EdgeEvent generateEdgeEvent(TenantId tenantId, EdgeId edgeId, EntityId entityId, EdgeEventActionType edgeEventAction) throws IOException { + protected EdgeEvent generateEdgeEvent(TenantId tenantId, EdgeId edgeId, EntityId entityId) throws IOException { if (tenantId == null) { tenantId = TenantId.fromUUID(Uuids.timeBased()); } @@ -92,7 +93,7 @@ public class EdgeEventServiceTest extends AbstractServiceTest { edgeEvent.setEdgeId(edgeId); edgeEvent.setEntityId(entityId.getId()); edgeEvent.setType(EdgeEventType.DEVICE); - edgeEvent.setAction(edgeEventAction); + edgeEvent.setAction(EdgeEventActionType.ADDED); edgeEvent.setBody(readFromResource("TestJsonData.json")); return edgeEvent; } @@ -101,7 +102,6 @@ public class EdgeEventServiceTest extends AbstractServiceTest { public void findEdgeEventsByTimeDescOrder() throws Exception { EdgeId edgeId = new EdgeId(Uuids.timeBased()); DeviceId deviceId = new DeviceId(Uuids.timeBased()); - TenantId tenantId = TenantId.fromUUID(Uuids.timeBased()); List> futures = new ArrayList<>(); futures.add(saveEdgeEventWithProvidedTime(timeBeforeStartTime, edgeId, deviceId, tenantId)); @@ -133,7 +133,7 @@ public class EdgeEventServiceTest extends AbstractServiceTest { } private ListenableFuture saveEdgeEventWithProvidedTime(long time, EdgeId edgeId, EntityId entityId, TenantId tenantId) throws Exception { - EdgeEvent edgeEvent = generateEdgeEvent(tenantId, edgeId, entityId, EdgeEventActionType.ADDED); + EdgeEvent edgeEvent = generateEdgeEvent(tenantId, edgeId, entityId); edgeEvent.setId(new EdgeEventId(Uuids.startOf(time))); return edgeEventService.saveAsync(edgeEvent); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java index ad351bb9f2..a624a2b6e5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java @@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery; import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.BooleanDataEntry; import org.thingsboard.server.common.data.kv.DoubleDataEntry; +import org.thingsboard.server.common.data.kv.JsonDataEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.LongDataEntry; import org.thingsboard.server.common.data.kv.ReadTsKvQuery; @@ -54,7 +55,9 @@ import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Andrew Shvayka @@ -64,12 +67,12 @@ import static org.junit.Assert.assertNotNull; public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { @Autowired - TimeseriesService tsService; + protected TimeseriesService tsService; @Autowired EntityViewService entityViewService; - static final int MAX_TIMEOUT = 30; + protected static final int MAX_TIMEOUT = 30; private static final String STRING_KEY = "stringKey"; private static final String LONG_KEY = "longKey"; @@ -84,7 +87,7 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { KvEntry doubleKvEntry = new DoubleDataEntry(DOUBLE_KEY, Double.MAX_VALUE); KvEntry booleanKvEntry = new BooleanDataEntry(BOOLEAN_KEY, Boolean.TRUE); - private TenantId tenantId; + protected TenantId tenantId; @Before public void before() { @@ -673,6 +676,32 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { assertEquals(3, list.size()); } + @Test + public void shouldSaveEntryOfEachType() throws Exception { + BasicTsKvEntry booleanEntry = new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(1), new BooleanDataEntry("test", true)); + BasicTsKvEntry stringEntry = new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(2), new StringDataEntry("test", "text")); + BasicTsKvEntry longEntry = new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(3), new LongDataEntry("test", 15L)); + BasicTsKvEntry doubleEntry = new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(4), new DoubleDataEntry("test", 10.5)); + BasicTsKvEntry jsonEntry = new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(5), new JsonDataEntry("test", "{\"test\":\"testValue\"}")); + List timeseries = List.of(booleanEntry, stringEntry, longEntry, doubleEntry, jsonEntry); + + DeviceId deviceId = new DeviceId(Uuids.timeBased()); + for (TsKvEntry tsKvEntry : timeseries) { + save(tenantId, deviceId, tsKvEntry); + } + + List listUntil3Minutes = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("test", 0L, + TimeUnit.MINUTES.toMillis(3), 1000, 10, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(2, listUntil3Minutes.size()); + assertThat(listUntil3Minutes).containsOnlyOnceElementsOf(List.of( + booleanEntry, stringEntry)); + + List fullList = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("test", 0L, + TimeUnit.MINUTES.toMillis(6), 1000, 10, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(5, fullList.size()); + assertThat(fullList).containsOnlyOnceElementsOf(timeseries); + } + private TsKvEntry save(DeviceId deviceId, long ts, long value) throws Exception { TsKvEntry entry = new BasicTsKvEntry(ts, new LongDataEntry(LONG_KEY, value)); tsService.save(tenantId, deviceId, entry).get(MAX_TIMEOUT, TimeUnit.SECONDS); @@ -691,6 +720,9 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { return entry; } + private void save(TenantId tenantId, DeviceId deviceId, TsKvEntry tsKvEntry) throws Exception { + tsService.save(tenantId, deviceId, tsKvEntry).get(MAX_TIMEOUT, TimeUnit.SECONDS); + } private void saveEntries(DeviceId deviceId, long ts) throws ExecutionException, InterruptedException, TimeoutException { tsService.save(tenantId, deviceId, toTsEntry(ts, stringKvEntry)).get(MAX_TIMEOUT, TimeUnit.SECONDS); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlSetNullEnabledTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlSetNullEnabledTest.java new file mode 100644 index 0000000000..1bbb37659c --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlSetNullEnabledTest.java @@ -0,0 +1,72 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.service.timeseries.nosql; + +import com.datastax.oss.driver.api.core.uuid.Uuids; +import org.junit.Test; +import org.springframework.test.context.TestPropertySource; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.kv.Aggregation; +import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.DoubleDataEntry; +import org.thingsboard.server.common.data.kv.LongDataEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.dao.service.DaoNoSqlTest; + +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +@DaoNoSqlTest +@TestPropertySource(properties = { + "cassandra.query.set_null_values_enabled=true", +}) +public class TimeseriesServiceNoSqlSetNullEnabledTest extends TimeseriesServiceNoSqlTest { + + @Override + @Test + public void testNullValuesOfNoneTargetColumn() throws ExecutionException, InterruptedException, TimeoutException { + long ts = TimeUnit.MINUTES.toMillis(1); + TsKvEntry longEntry = new BasicTsKvEntry(ts, new LongDataEntry("temp", 0L)); + double doubleValue = 20.6; + TsKvEntry doubleEntry = new BasicTsKvEntry(ts, new DoubleDataEntry("temp", doubleValue)); + DeviceId deviceId = new DeviceId(Uuids.timeBased()); + tsService.save(tenantId, deviceId, longEntry).get(MAX_TIMEOUT, TimeUnit.SECONDS); + tsService.save(tenantId, deviceId, doubleEntry).get(MAX_TIMEOUT, TimeUnit.SECONDS); + + List listWithoutAgg = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("temp", 0L, + ts + 1 , 1000, 3, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(1, listWithoutAgg.size()); + assertFalse(listWithoutAgg.get(0).getLongValue().isPresent()); + assertTrue(listWithoutAgg.get(0).getDoubleValue().isPresent()); + assertThat(listWithoutAgg.get(0).getDoubleValue().get()).isEqualTo(doubleValue); + + // long value should be set to null after second insert, so avg = doubleValue + List listWithAgg = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("temp", 0L, + ts + 1 , 1000, 3, Aggregation.AVG))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(1, listWithAgg.size()); + assertTrue(listWithAgg.get(0).getDoubleValue().isPresent()); + assertThat(listWithAgg.get(0).getDoubleValue().get()).isEqualTo(doubleValue); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java index 229d5f5842..b8970feca3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java @@ -15,9 +15,83 @@ */ package org.thingsboard.server.dao.service.timeseries.nosql; +import com.datastax.oss.driver.api.core.uuid.Uuids; +import org.junit.Test; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.kv.Aggregation; +import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.BooleanDataEntry; +import org.thingsboard.server.common.data.kv.DoubleDataEntry; +import org.thingsboard.server.common.data.kv.JsonDataEntry; +import org.thingsboard.server.common.data.kv.LongDataEntry; +import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @DaoNoSqlTest public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest { + + @Test + public void shouldSaveEntryOfEachTypeWithTtl() throws ExecutionException, InterruptedException, TimeoutException { + long ttlInSec = TimeUnit.SECONDS.toSeconds(3); + List timeseries = List.of( + new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(1), new BooleanDataEntry("test", true)), + new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(2), new StringDataEntry("test", "text")), + new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(3), new LongDataEntry("test", 15L)), + new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(4), new DoubleDataEntry("test", 10.5)), + new BasicTsKvEntry(TimeUnit.MINUTES.toMillis(5), new JsonDataEntry("test", "{\"test\":\"testValue\"}"))); + + DeviceId deviceId = new DeviceId(Uuids.timeBased()); + tsService.save(tenantId, deviceId, timeseries, ttlInSec); + + List fullList = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("test", 0L, + TimeUnit.MINUTES.toMillis(6), 1000, 10, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(5, fullList.size()); + + // check entries after ttl + Thread.sleep(TimeUnit.SECONDS.toMillis(ttlInSec + 1)); + List listAfterTtl = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("test", 0L, + TimeUnit.MINUTES.toMillis(6), 1000, 10, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(0, listAfterTtl.size()); + } + + @Test + public void testNullValuesOfNoneTargetColumn() throws ExecutionException, InterruptedException, TimeoutException { + long ts = TimeUnit.MINUTES.toMillis(1); + long longValue = 10L; + TsKvEntry longEntry = new BasicTsKvEntry(ts, new LongDataEntry("temp", longValue)); + double doubleValue = 20.6; + TsKvEntry doubleEntry = new BasicTsKvEntry(ts, new DoubleDataEntry("temp", doubleValue)); + DeviceId deviceId = new DeviceId(Uuids.timeBased()); + tsService.save(tenantId, deviceId, longEntry).get(MAX_TIMEOUT, TimeUnit.SECONDS); + tsService.save(tenantId, deviceId, doubleEntry).get(MAX_TIMEOUT, TimeUnit.SECONDS); + + List listWithoutAgg = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("temp", 0L, + ts + 1 , 1000, 3, Aggregation.NONE))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(1, listWithoutAgg.size()); + assertTrue(listWithoutAgg.get(0).getLongValue().isPresent()); + assertFalse(listWithoutAgg.get(0).getDoubleValue().isPresent()); + assertThat(listWithoutAgg.get(0).getLongValue().get()).isEqualTo(longValue); + + // long value should not be reset to null, so avg = (doubleValue + longValue)/ 2 + List listWithAgg = tsService.findAll(tenantId, deviceId, Collections.singletonList(new BaseReadTsKvQuery("temp", 0L, + ts + 1, 200000, 3, Aggregation.AVG))).get(MAX_TIMEOUT, TimeUnit.SECONDS); + assertEquals(1, listWithAgg.size()); + assertTrue(listWithAgg.get(0).getDoubleValue().isPresent()); + double expectedValue = (doubleValue + longValue)/ 2; + assertThat(listWithAgg.get(0).getDoubleValue().get()).isEqualTo(expectedValue); + } } diff --git a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java index 8ee73110a0..eef0126f7f 100644 --- a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java +++ b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClient.java @@ -21,6 +21,7 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.handler.codec.mqtt.MqttQoS; import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.Promise; import org.thingsboard.common.util.ListeningExecutor; public interface MqttClient { @@ -32,7 +33,7 @@ public interface MqttClient { * @param host The ip address or host to connect to * @return A future which will be completed when the connection is opened and we received an CONNACK */ - Future connect(String host); + Promise connect(String host); /** * Connect to the specified hostname/ip using the specified port @@ -41,7 +42,7 @@ public interface MqttClient { * @param port The tcp port to connect to * @return A future which will be completed when the connection is opened and we received an CONNACK */ - Future connect(String host, int port); + Promise connect(String host, int port); /** * @@ -55,7 +56,7 @@ public interface MqttClient { * @return A future which will be completed when the connection is opened and we received an CONNACK * @throws IllegalStateException if no previous {@link #connect(String, int)} calls were attempted */ - Future reconnect(); + Promise reconnect(); /** * Retrieve the netty {@link EventLoopGroup} we are using diff --git a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java index dedc670490..6781bb171a 100644 --- a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java +++ b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java @@ -118,7 +118,7 @@ final class MqttClientImpl implements MqttClient { * @return A future which will be completed when the connection is opened and we received an CONNACK */ @Override - public Future connect(String host) { + public Promise connect(String host) { return connect(host, 1883); } @@ -130,11 +130,11 @@ final class MqttClientImpl implements MqttClient { * @return A future which will be completed when the connection is opened and we received an CONNACK */ @Override - public Future connect(String host, int port) { + public Promise connect(String host, int port) { return connect(host, port, false); } - private Future connect(String host, int port, boolean reconnect) { + private Promise connect(String host, int port, boolean reconnect) { log.trace("[{}] Connecting to server, isReconnect - {}", channel != null ? channel.id() : "UNKNOWN", reconnect); if (this.eventLoop == null) { this.eventLoop = new NioEventLoopGroup(); @@ -199,7 +199,7 @@ final class MqttClientImpl implements MqttClient { } @Override - public Future reconnect() { + public Promise reconnect() { log.trace("[{}] Reconnecting to server, isReconnect - {}", channel != null ? channel.id() : "UNKNOWN", reconnect); if (host == null) { throw new IllegalStateException("Cannot reconnect. Call connect() first"); diff --git a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java index 8a398eeec5..04103bf67b 100644 --- a/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java +++ b/netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java @@ -21,6 +21,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.handler.codec.mqtt.MqttMessageType; import io.netty.handler.codec.mqtt.MqttQoS; import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.Promise; import lombok.extern.slf4j.Slf4j; import org.junit.After; import org.junit.Assert; @@ -127,7 +128,7 @@ public class MqttIntegrationTest { config.setReconnectDelay(RECONNECT_DELAY_SECONDS); MqttClient client = MqttClient.create(config, null, handlerExecutor); client.setEventLoop(this.eventLoopGroup); - Future connectFuture = client.connect(MQTT_HOST, this.mqttServer.getMqttPort()); + Promise connectFuture = client.connect(MQTT_HOST, this.mqttServer.getMqttPort()); String hostPort = MQTT_HOST + ":" + this.mqttServer.getMqttPort(); MqttConnectResult result; diff --git a/pom.xml b/pom.xml index 6efb293c41..3a5e64db9e 100755 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,7 @@ 2.7.2 1.5.2 5.8.2 + 4.5.1 2.6.0 5.13.1 1.3.0 @@ -1649,6 +1650,12 @@ + + org.mockito + mockito-inline + ${mockito.version} + test + org.testng testng diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java index f3a7ee77c7..8783770be3 100644 --- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java @@ -525,12 +525,11 @@ public class RestClient implements Closeable { } public PageData getAlarmComments(AlarmId alarmId, PageLink pageLink) { - String urlSecondPart = "/api/alarm/{alarmId}/comment"; Map params = new HashMap<>(); params.put("alarmId", alarmId.getId().toString()); - + addPageLinkToParam(params, pageLink); return restTemplate.exchange( - baseURL + urlSecondPart + "&" + getUrlParams(pageLink), + baseURL + "/api/alarm/{alarmId}/comment?" + getUrlParams(pageLink), HttpMethod.GET, HttpEntity.EMPTY, new ParameterizedTypeReference>() { diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineDeviceStateManager.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineDeviceStateManager.java new file mode 100644 index 0000000000..82c2916408 --- /dev/null +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineDeviceStateManager.java @@ -0,0 +1,32 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.api; + +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.queue.TbCallback; + +public interface RuleEngineDeviceStateManager { + + void onDeviceConnect(TenantId tenantId, DeviceId deviceId, long connectTime, TbCallback callback); + + void onDeviceActivity(TenantId tenantId, DeviceId deviceId, long activityTime, TbCallback callback); + + void onDeviceDisconnect(TenantId tenantId, DeviceId deviceId, long disconnectTime, TbCallback callback); + + void onDeviceInactivity(TenantId tenantId, DeviceId deviceId, long inactivityTime, TbCallback callback); + +} diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java index 59f5b128a7..fc2980650b 100644 --- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java +++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java @@ -280,6 +280,10 @@ public interface TbContext { DeviceCredentialsService getDeviceCredentialsService(); + RuleEngineDeviceStateManager getDeviceStateManager(); + + String getDeviceStateNodeRateLimitConfig(); + TbClusterService getClusterService(); DashboardService getDashboardService(); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java new file mode 100644 index 0000000000..7925178b33 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNode.java @@ -0,0 +1,173 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.action; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.ConcurrentReferenceHashMap; +import org.thingsboard.rule.engine.api.RuleEngineDeviceStateManager; +import org.thingsboard.rule.engine.api.RuleNode; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.rule.engine.api.util.TbNodeUtils; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.data.msg.TbNodeConnectionType; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.queue.PartitionChangeMsg; +import org.thingsboard.server.common.msg.queue.TbCallback; +import org.thingsboard.server.common.msg.tools.TbRateLimits; + +import java.util.EnumSet; +import java.util.Set; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "device state", + nodeDescription = "Triggers device connectivity events", + nodeDetails = "If incoming message originator is a device, registers configured event for that device in the Device State Service, which sends appropriate message to the Rule Engine." + + " If metadata ts property is present, it will be used as event timestamp. Otherwise, the message timestamp will be used." + + " If originator entity type is not DEVICE or unexpected error happened during processing, then incoming message is forwarded using Failure chain." + + " If rate of connectivity events for a given originator is too high, then incoming message is forwarded using Rate limited chain. " + + "
" + + "Supported device connectivity events are:" + + "
    " + + "
  • Connect event
    • " + + "
  • Disconnect event
    • " + + "
  • Activity event
    • " + + "
  • Inactivity event
    • " + + "
" + + "This node is particularly useful when device isn't using transports to receive data, such as when fetching data from external API or computing new data within the rule chain.", + configClazz = TbDeviceStateNodeConfiguration.class, + relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, "Rate limited"}, + uiResources = {"static/rulenode/rulenode-core-config.js"}, + configDirective = "tbActionNodeDeviceStateConfig" +) +public class TbDeviceStateNode implements TbNode { + + private static final Set SUPPORTED_EVENTS = EnumSet.of( + TbMsgType.CONNECT_EVENT, TbMsgType.ACTIVITY_EVENT, TbMsgType.DISCONNECT_EVENT, TbMsgType.INACTIVITY_EVENT + ); + private static final String DEFAULT_RATE_LIMIT_CONFIG = "1:1,30:60,60:3600"; + private ConcurrentReferenceHashMap rateLimits; + private String rateLimitConfig; + private TbMsgType event; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + TbMsgType event = TbNodeUtils.convert(configuration, TbDeviceStateNodeConfiguration.class).getEvent(); + if (event == null) { + throw new TbNodeException("Event cannot be null!", true); + } + if (!SUPPORTED_EVENTS.contains(event)) { + throw new TbNodeException("Unsupported event: " + event, true); + } + this.event = event; + rateLimits = new ConcurrentReferenceHashMap<>(); + String deviceStateNodeRateLimitConfig = ctx.getDeviceStateNodeRateLimitConfig(); + try { + rateLimitConfig = new TbRateLimits(deviceStateNodeRateLimitConfig).getConfiguration(); + } catch (Exception e) { + log.error("[{}][{}] Invalid rate limit configuration provided: [{}]. Will use default value [{}].", + ctx.getTenantId().getId(), ctx.getSelfId().getId(), deviceStateNodeRateLimitConfig, DEFAULT_RATE_LIMIT_CONFIG, e); + rateLimitConfig = DEFAULT_RATE_LIMIT_CONFIG; + } + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + EntityType originatorEntityType = msg.getOriginator().getEntityType(); + if (!EntityType.DEVICE.equals(originatorEntityType)) { + ctx.tellFailure(msg, new IllegalArgumentException( + "Unsupported originator entity type: [" + originatorEntityType + "]. Only DEVICE entity type is supported." + )); + return; + } + DeviceId originator = new DeviceId(msg.getOriginator().getId()); + rateLimits.compute(originator, (__, rateLimit) -> { + if (rateLimit == null) { + rateLimit = new TbRateLimits(rateLimitConfig); + } + boolean isNotRateLimited = rateLimit.tryConsume(); + if (isNotRateLimited) { + sendEventAndTell(ctx, originator, msg); + } else { + ctx.tellNext(msg, "Rate limited"); + } + return rateLimit; + }); + } + + private void sendEventAndTell(TbContext ctx, DeviceId originator, TbMsg msg) { + TenantId tenantId = ctx.getTenantId(); + long eventTs = msg.getMetaDataTs(); + + RuleEngineDeviceStateManager deviceStateManager = ctx.getDeviceStateManager(); + TbCallback callback = getMsgEnqueuedCallback(ctx, msg); + + switch (event) { + case CONNECT_EVENT: + deviceStateManager.onDeviceConnect(tenantId, originator, eventTs, callback); + break; + case ACTIVITY_EVENT: + deviceStateManager.onDeviceActivity(tenantId, originator, eventTs, callback); + break; + case DISCONNECT_EVENT: + deviceStateManager.onDeviceDisconnect(tenantId, originator, eventTs, callback); + break; + case INACTIVITY_EVENT: + deviceStateManager.onDeviceInactivity(tenantId, originator, eventTs, callback); + break; + default: + ctx.tellFailure(msg, new IllegalStateException("Configured event [" + event + "] is not supported!")); + } + } + + private TbCallback getMsgEnqueuedCallback(TbContext ctx, TbMsg msg) { + return new TbCallback() { + @Override + public void onSuccess() { + ctx.tellSuccess(msg); + } + + @Override + public void onFailure(Throwable t) { + ctx.tellFailure(msg, t); + } + }; + } + + @Override + public void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) { + rateLimits.entrySet().removeIf(entry -> !ctx.isLocalEntity(entry.getKey())); + } + + @Override + public void destroy() { + if (rateLimits != null) { + rateLimits.clear(); + rateLimits = null; + } + rateLimitConfig = null; + event = null; + } + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeConfiguration.java new file mode 100644 index 0000000000..c23338fcd1 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeConfiguration.java @@ -0,0 +1,34 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.action; + +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.msg.TbMsgType; + +@Data +public class TbDeviceStateNodeConfiguration implements NodeConfiguration { + + private TbMsgType event; + + @Override + public TbDeviceStateNodeConfiguration defaultConfiguration() { + var config = new TbDeviceStateNodeConfiguration(); + config.setEvent(TbMsgType.ACTIVITY_EVENT); + return config; + } + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java index 31fda250d0..4176ead31c 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java @@ -47,6 +47,7 @@ import static org.thingsboard.server.common.data.msg.TbMsgType.INACTIVITY_EVENT; import static org.thingsboard.server.common.data.msg.TbMsgType.POST_ATTRIBUTES_REQUEST; import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_REQUEST; import static org.thingsboard.server.common.data.msg.TbMsgType.TIMESERIES_UPDATED; +import static org.thingsboard.server.common.data.msg.TbMsgType.TO_SERVER_RPC_REQUEST; @Slf4j public abstract class AbstractTbMsgPushNode implements TbNode { @@ -176,6 +177,6 @@ public abstract class AbstractTbMsgPushNode
" + + "If an object with coordinates extracted from incoming message enters the geofence, sends a message with the type Entered. " + + "If an object leaves the geofence, sends a message with the type Left. " + + "If the presence monitoring strategy \"On first message\" is selected, sends messages via rule node connection type Inside or Outside only the first time the geofencing and duration conditions are satisfied; otherwise sends messages via rule node connection type Success. " + + "If the presence monitoring strategy \"On each message\" is selected, sends messages via rule node connection type Inside or Outside every time the geofencing condition is satisfied. " + + "

" + + "Output connections: Entered, Left, Inside, Outside, Success", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbActionNodeGpsGeofencingConfig" ) public class TbGpsGeofencingActionNode extends AbstractGeofencingNode { + private static final String REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE = "reportPresenceStatusOnEachMessage"; private final Map entityStates = new HashMap<>(); private final Gson gson = new Gson(); private final JsonParser parser = new JsonParser(); @@ -80,25 +97,32 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode (entityState.isInside() ? - TimeUnit.valueOf(config.getMinInsideDurationTimeUnit()).toMillis(config.getMinInsideDuration()) : TimeUnit.valueOf(config.getMinOutsideDurationTimeUnit()).toMillis(config.getMinOutsideDuration()))) { - setStaid(ctx, msg.getOriginator(), entityState); - ctx.tellNext(msg, entityState.isInside() ? "Inside" : "Outside"); - told = true; - } - } + ctx.tellNext(msg, matches ? ENTERED : LEFT); + return; + } + + if (config.isReportPresenceStatusOnEachMessage()) { + ctx.tellNext(msg, entityState.isInside() ? INSIDE : OUTSIDE); + return; } - if (!told) { + + if (entityState.isStayed()) { ctx.tellSuccess(msg); + return; + } + + long stayTime = ts - entityState.getStateSwitchTime(); + if (stayTime > (entityState.isInside() ? + TimeUnit.valueOf(config.getMinInsideDurationTimeUnit()).toMillis(config.getMinInsideDuration()) : + TimeUnit.valueOf(config.getMinOutsideDurationTimeUnit()).toMillis(config.getMinOutsideDuration()))) { + setStaid(ctx, msg.getOriginator(), entityState); + ctx.tellNext(msg, entityState.isInside() ? INSIDE : OUTSIDE); + return; } + + ctx.tellSuccess(msg); } private void switchState(TbContext ctx, EntityId entityId, EntityGeofencingState entityState, boolean matches, long ts) { @@ -127,4 +151,17 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode getConfigClazz() { return TbGpsGeofencingActionNodeConfiguration.class; } + + @Override + public TbPair upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException { + boolean hasChanges = false; + if (fromVersion == 0) { + if (!oldConfiguration.has(REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE)) { + hasChanges = true; + ((ObjectNode) oldConfiguration).put(REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE, false); + } + } + return new TbPair<>(hasChanges, oldConfiguration); + } + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java index d0adad8996..04bbab01b7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java @@ -31,6 +31,8 @@ public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilte private String minInsideDurationTimeUnit; private String minOutsideDurationTimeUnit; + private boolean reportPresenceStatusOnEachMessage; + @Override public TbGpsGeofencingActionNodeConfiguration defaultConfiguration() { TbGpsGeofencingActionNodeConfiguration configuration = new TbGpsGeofencingActionNodeConfiguration(); @@ -43,6 +45,7 @@ public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilte configuration.setMinOutsideDurationTimeUnit(TimeUnit.MINUTES.name()); configuration.setMinInsideDuration(1); configuration.setMinOutsideDuration(1); + configuration.setReportPresenceStatusOnEachMessage(true); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java index 7632402e5e..6e80a1577b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java @@ -18,7 +18,7 @@ package org.thingsboard.rule.engine.mqtt; import io.netty.buffer.Unpooled; import io.netty.handler.codec.mqtt.MqttQoS; import io.netty.handler.ssl.SslContext; -import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.Promise; import lombok.extern.slf4j.Slf4j; import org.thingsboard.mqtt.MqttClient; import org.thingsboard.mqtt.MqttClientConfig; @@ -121,7 +121,7 @@ public class TbMqttNode extends TbAbstractExternalNode { prepareMqttClientConfig(config); MqttClient client = MqttClient.create(config, null, ctx.getExternalCallExecutor()); client.setEventLoop(ctx.getSharedEventLoop()); - Future connectFuture = client.connect(this.mqttNodeConfiguration.getHost(), this.mqttNodeConfiguration.getPort()); + Promise connectFuture = client.connect(this.mqttNodeConfiguration.getHost(), this.mqttNodeConfiguration.getPort()); MqttConnectResult result; try { result = connectFuture.get(this.mqttNodeConfiguration.getConnectTimeoutSec(), TimeUnit.SECONDS); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoader.java index 80d73b9478..4d651f48fa 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoader.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoader.java @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.AlarmId; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EdgeId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityViewId; import org.thingsboard.server.common.data.id.RuleChainId; @@ -63,6 +64,9 @@ public class EntitiesFieldsAsyncLoader { case ENTITY_VIEW: return toEntityFieldsDataAsync(ctx.getEntityViewService().findEntityViewByIdAsync(ctx.getTenantId(), (EntityViewId) originatorId), EntityFieldsData::new, ctx); + case EDGE: + return toEntityFieldsDataAsync(ctx.getEdgeService().findEdgeByIdAsync(ctx.getTenantId(), (EdgeId) originatorId), + EntityFieldsData::new, ctx); default: return Futures.immediateFailedFuture(new TbNodeException("Unexpected originator EntityType: " + originatorId.getEntityType())); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java new file mode 100644 index 0000000000..db5ddaf698 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java @@ -0,0 +1,23 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.util; + +public class GpsGeofencingEvents { + public static final String ENTERED = "Entered"; + public static final String INSIDE = "Inside"; + public static final String LEFT = "Left"; + public static final String OUTSIDE = "Outside"; +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java new file mode 100644 index 0000000000..9352d64809 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java @@ -0,0 +1,296 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.action; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.util.ConcurrentReferenceHashMap; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.rule.engine.api.RuleEngineDeviceStateManager; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.RuleNodeId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.common.msg.queue.PartitionChangeMsg; +import org.thingsboard.server.common.msg.queue.ServiceType; +import org.thingsboard.server.common.msg.queue.TbCallback; +import org.thingsboard.server.common.msg.tools.TbRateLimits; + +import java.util.UUID; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.then; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; + +@ExtendWith(MockitoExtension.class) +public class TbDeviceStateNodeTest { + + @Mock + private TbContext ctxMock; + @Mock + private static RuleEngineDeviceStateManager deviceStateManagerMock; + @Captor + private static ArgumentCaptor callbackCaptor; + private TbDeviceStateNode node; + private TbDeviceStateNodeConfiguration config; + + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); + private static final DeviceId DEVICE_ID = new DeviceId(UUID.randomUUID()); + private static final long METADATA_TS = 123L; + private TbMsg msg; + + @BeforeEach + public void setup() { + var metaData = new TbMsgMetaData(); + metaData.putValue("deviceName", "My humidity sensor"); + metaData.putValue("deviceType", "Humidity sensor"); + metaData.putValue("ts", String.valueOf(METADATA_TS)); + var data = JacksonUtil.newObjectNode(); + data.put("humidity", 58.3); + msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, metaData, JacksonUtil.toString(data)); + } + + @BeforeEach + public void setUp() { + node = new TbDeviceStateNode(); + config = new TbDeviceStateNodeConfiguration().defaultConfiguration(); + } + + @Test + public void givenDefaultConfiguration_whenInvoked_thenCorrectValuesAreSet() { + assertThat(config.getEvent()).isEqualTo(TbMsgType.ACTIVITY_EVENT); + } + + @Test + public void givenNullEventInConfig_whenInit_thenThrowsUnrecoverableTbNodeException() { + // GIVEN-WHEN-THEN + assertThatThrownBy(() -> initNode(null)) + .isInstanceOf(TbNodeException.class) + .hasMessage("Event cannot be null!") + .matches(e -> ((TbNodeException) e).isUnrecoverable()); + } + + @Test + public void givenInvalidRateLimitConfig_whenInit_thenUsesDefaultConfig() { + // GIVEN + given(ctxMock.getDeviceStateNodeRateLimitConfig()).willReturn("invalid rate limit config"); + given(ctxMock.getTenantId()).willReturn(TENANT_ID); + given(ctxMock.getSelfId()).willReturn(new RuleNodeId(UUID.randomUUID())); + + // WHEN + try { + initNode(TbMsgType.ACTIVITY_EVENT); + } catch (Exception e) { + fail("Node failed to initialize!", e); + } + + // THEN + String actualRateLimitConfig = (String) ReflectionTestUtils.getField(node, "rateLimitConfig"); + assertThat(actualRateLimitConfig).isEqualTo("1:1,30:60,60:3600"); + } + + @Test + public void givenMsgArrivedTooFast_whenOnMsg_thenRateLimitsThisMsg() { + // GIVEN + ConcurrentReferenceHashMap rateLimits = new ConcurrentReferenceHashMap<>(); + ReflectionTestUtils.setField(node, "rateLimits", rateLimits); + + var rateLimitMock = mock(TbRateLimits.class); + rateLimits.put(DEVICE_ID, rateLimitMock); + + given(rateLimitMock.tryConsume()).willReturn(false); + + // WHEN + node.onMsg(ctxMock, msg); + + // THEN + then(ctxMock).should().tellNext(msg, "Rate limited"); + then(ctxMock).should(never()).tellSuccess(any()); + then(ctxMock).should(never()).tellFailure(any(), any()); + then(ctxMock).shouldHaveNoMoreInteractions(); + then(deviceStateManagerMock).shouldHaveNoInteractions(); + } + + @Test + public void givenHasNonLocalDevices_whenOnPartitionChange_thenRemovesEntriesForNonLocalDevices() { + // GIVEN + ConcurrentReferenceHashMap rateLimits = new ConcurrentReferenceHashMap<>(); + ReflectionTestUtils.setField(node, "rateLimits", rateLimits); + + rateLimits.put(DEVICE_ID, new TbRateLimits("1:1")); + given(ctxMock.isLocalEntity(eq(DEVICE_ID))).willReturn(true); + + DeviceId nonLocalDeviceId1 = new DeviceId(UUID.randomUUID()); + rateLimits.put(nonLocalDeviceId1, new TbRateLimits("2:2")); + given(ctxMock.isLocalEntity(eq(nonLocalDeviceId1))).willReturn(false); + + DeviceId nonLocalDeviceId2 = new DeviceId(UUID.randomUUID()); + rateLimits.put(nonLocalDeviceId2, new TbRateLimits("3:3")); + given(ctxMock.isLocalEntity(eq(nonLocalDeviceId2))).willReturn(false); + + // WHEN + node.onPartitionChangeMsg(ctxMock, new PartitionChangeMsg(ServiceType.TB_RULE_ENGINE)); + + // THEN + assertThat(rateLimits) + .containsKey(DEVICE_ID) + .doesNotContainKey(nonLocalDeviceId1) + .doesNotContainKey(nonLocalDeviceId2) + .size().isOne(); + } + + @ParameterizedTest + @EnumSource( + value = TbMsgType.class, + names = {"CONNECT_EVENT", "ACTIVITY_EVENT", "DISCONNECT_EVENT", "INACTIVITY_EVENT"}, + mode = EnumSource.Mode.EXCLUDE + ) + public void givenUnsupportedEventInConfig_whenInit_thenThrowsUnrecoverableTbNodeException(TbMsgType unsupportedEvent) { + // GIVEN-WHEN-THEN + assertThatThrownBy(() -> initNode(unsupportedEvent)) + .isInstanceOf(TbNodeException.class) + .hasMessage("Unsupported event: " + unsupportedEvent) + .matches(e -> ((TbNodeException) e).isUnrecoverable()); + } + + @ParameterizedTest + @EnumSource(value = EntityType.class, names = "DEVICE", mode = EnumSource.Mode.EXCLUDE) + public void givenNonDeviceOriginator_whenOnMsg_thenTellsSuccessAndNoActivityActionsTriggered(EntityType unsupportedType) { + // GIVEN + var nonDeviceOriginator = new EntityId() { + + @Override + public UUID getId() { + return UUID.randomUUID(); + } + + @Override + public EntityType getEntityType() { + return unsupportedType; + } + }; + var msg = TbMsg.newMsg(TbMsgType.ENTITY_CREATED, nonDeviceOriginator, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT); + + // WHEN + node.onMsg(ctxMock, msg); + + // THEN + var exceptionCaptor = ArgumentCaptor.forClass(Exception.class); + then(ctxMock).should().tellFailure(eq(msg), exceptionCaptor.capture()); + assertThat(exceptionCaptor.getValue()) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("Unsupported originator entity type: [" + unsupportedType + "]. Only DEVICE entity type is supported."); + + then(ctxMock).shouldHaveNoMoreInteractions(); + } + + @Test + public void givenMetadataDoesNotContainTs_whenOnMsg_thenMsgTsIsUsedAsEventTs() { + // GIVEN + given(ctxMock.getDeviceStateNodeRateLimitConfig()).willReturn("1:1"); + try { + initNode(TbMsgType.ACTIVITY_EVENT); + } catch (TbNodeException e) { + fail("Node failed to initialize!", e); + } + + given(ctxMock.getTenantId()).willReturn(TENANT_ID); + given(ctxMock.getDeviceStateManager()).willReturn(deviceStateManagerMock); + + long msgTs = METADATA_TS + 1; + msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT, msgTs); + + // WHEN + node.onMsg(ctxMock, msg); + + // THEN + then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(msgTs), any()); + } + + @ParameterizedTest + @MethodSource + public void givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback(TbMsgType supportedEventType, Runnable actionVerification) { + // GIVEN + given(ctxMock.getTenantId()).willReturn(TENANT_ID); + given(ctxMock.getDeviceStateNodeRateLimitConfig()).willReturn("1:1"); + given(ctxMock.getDeviceStateManager()).willReturn(deviceStateManagerMock); + + try { + initNode(supportedEventType); + } catch (TbNodeException e) { + fail("Node failed to initialize!", e); + } + + // WHEN + node.onMsg(ctxMock, msg); + + // THEN + actionVerification.run(); + + TbCallback actualCallback = callbackCaptor.getValue(); + + actualCallback.onSuccess(); + then(ctxMock).should().tellSuccess(msg); + + var throwable = new Throwable(); + actualCallback.onFailure(throwable); + then(ctxMock).should().tellFailure(msg, throwable); + + + then(deviceStateManagerMock).shouldHaveNoMoreInteractions(); + then(ctxMock).shouldHaveNoMoreInteractions(); + } + + private static Stream givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback() { + return Stream.of( + Arguments.of(TbMsgType.CONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceConnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())), + Arguments.of(TbMsgType.ACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())), + Arguments.of(TbMsgType.DISCONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceDisconnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())), + Arguments.of(TbMsgType.INACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceInactivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())) + ); + } + + private void initNode(TbMsgType event) throws TbNodeException { + config.setEvent(event); + var nodeConfig = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); + node.init(ctxMock, nodeConfig); + } + +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java new file mode 100644 index 0000000000..804d30d28f --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.geo; + +import lombok.Data; +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.HashMap; +import java.util.Map; + +@Data +public class GpsGeofencingActionTestCase { + + private EntityId entityId; + private Map entityStates; + private boolean msgInside; + private boolean reportPresenceStatusOnEachMessage; + + public GpsGeofencingActionTestCase(EntityId entityId, boolean msgInside, boolean reportPresenceStatusOnEachMessage, EntityGeofencingState entityGeofencingState) { + this.entityId = entityId; + this.msgInside = msgInside; + this.reportPresenceStatusOnEachMessage = reportPresenceStatusOnEachMessage; + this.entityStates = new HashMap<>(); + this.entityStates.put(entityId, entityGeofencingState); + } +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java new file mode 100644 index 0000000000..5cd7e02c59 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java @@ -0,0 +1,259 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.geo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.dao.attributes.AttributesService; + +import java.time.Duration; +import java.util.UUID; +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.ENTERED; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.INSIDE; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.LEFT; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.OUTSIDE; +import static org.thingsboard.server.common.data.msg.TbNodeConnectionType.SUCCESS; + +@ExtendWith(MockitoExtension.class) +class TbGpsGeofencingActionNodeTest extends AbstractRuleNodeUpgradeTest { + + @Mock + private TbContext ctx; + @Mock + private AttributesService attributesService; + private TbGpsGeofencingActionNode node; + + @BeforeEach + void setUp() { + node = spy(new TbGpsGeofencingActionNode()); + } + + @AfterEach + void tearDown() { + node.destroy(); + } + + private static Stream givenReportPresenceStatusOnEachMessage_whenOnMsg_thenVerifyOutputMsgType() { + DeviceId deviceId = new DeviceId(UUID.randomUUID()); + long tsNow = System.currentTimeMillis(); + long tsNowMinusMinuteAndMillis = tsNow - Duration.ofMinutes(1).plusMillis(1).toMillis(); + return Stream.of( + // default config with presenceMonitoringStrategyOnEachMessage false and msgInside true + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(false, 0, false)), ENTERED), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNow, false)), SUCCESS), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNowMinusMinuteAndMillis, false)), INSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNow, true)), SUCCESS), + // default config with presenceMonitoringStrategyOnEachMessage false and msgInside false + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, 0, false)), LEFT), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNow, false)), SUCCESS), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNowMinusMinuteAndMillis, false)), OUTSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNow, true)), SUCCESS), + // default config with presenceMonitoringStrategyOnEachMessage true and msgInside true + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(false, 0, false)), ENTERED), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(true, tsNow, false)), INSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(true, tsNowMinusMinuteAndMillis, false)), INSIDE), + // default config with presenceMonitoringStrategyOnEachMessage true and msgInside false + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, 0, false)), LEFT), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, tsNow, false)), OUTSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, tsNowMinusMinuteAndMillis, false)), OUTSIDE) + ); + } + + @ParameterizedTest + @MethodSource + void givenReportPresenceStatusOnEachMessage_whenOnMsg_thenVerifyOutputMsgType( + GpsGeofencingActionTestCase gpsGeofencingActionTestCase, + String expectedOutput + ) throws TbNodeException { + // GIVEN + var config = new TbGpsGeofencingActionNodeConfiguration().defaultConfiguration(); + config.setReportPresenceStatusOnEachMessage(gpsGeofencingActionTestCase.isReportPresenceStatusOnEachMessage()); + + node.init(ctx, new TbNodeConfiguration(JacksonUtil.valueToTree(config))); + + TbMsg msg = gpsGeofencingActionTestCase.isMsgInside() ? + getInsideRectangleTbMsg(gpsGeofencingActionTestCase.getEntityId()) : + getOutsideRectangleTbMsg(gpsGeofencingActionTestCase.getEntityId()); + + when(ctx.getAttributesService()).thenReturn(attributesService); + + ReflectionTestUtils.setField(node, "entityStates", gpsGeofencingActionTestCase.getEntityStates()); + + // WHEN + node.onMsg(ctx, msg); + + // THEN + verify(ctx.getAttributesService(), never()).find(any(), any(), any(), anyString()); + verify(ctx, never()).tellFailure(any(), any(Throwable.class)); + verify(ctx, never()).enqueueForTellNext(any(), eq(expectedOutput), any(), any()); + verify(ctx, never()).ack(any()); + + if (SUCCESS.equals(expectedOutput)) { + verify(ctx).tellSuccess(eq(msg)); + } else { + verify(ctx).tellNext(eq(msg), eq(expectedOutput)); + } + } + + private TbMsg getOutsideRectangleTbMsg(EntityId entityId) { + return getTbMsg(entityId, getMetadataForNewVersionPolygonPerimeter(), + GeoUtilTest.POINT_OUTSIDE_SIMPLE_RECT.getLatitude(), + GeoUtilTest.POINT_OUTSIDE_SIMPLE_RECT.getLongitude()); + } + + private TbMsg getInsideRectangleTbMsg(EntityId entityId) { + return getTbMsg(entityId, getMetadataForNewVersionPolygonPerimeter(), + GeoUtilTest.POINT_INSIDE_SIMPLE_RECT_CENTER.getLatitude(), + GeoUtilTest.POINT_INSIDE_SIMPLE_RECT_CENTER.getLongitude()); + } + + private TbMsg getTbMsg(EntityId entityId, TbMsgMetaData metadata, double latitude, double longitude) { + String data = "{\"latitude\": " + latitude + ", \"longitude\": " + longitude + "}"; + return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, metadata, data); + } + + private TbMsgMetaData getMetadataForNewVersionPolygonPerimeter() { + var metadata = new TbMsgMetaData(); + metadata.putValue("ss_perimeter", GeoUtilTest.SIMPLE_RECT); + return metadata; + } + + // Rule nodes upgrade + private static Stream givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() { + return Stream.of( + // default config for version 0 + Arguments.of(0, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n", + true, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n"), + // default config for version 1 with upgrade from version 0 + Arguments.of(0, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n", + false, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n") + ); + } + + @Override + protected TbNode getTestNode() { + return node; + } + +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java index 5967023354..f3e61dcffc 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java @@ -37,10 +37,12 @@ import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.id.AlarmId; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EdgeId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.id.EntityViewId; @@ -52,6 +54,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.device.DeviceService; +import org.thingsboard.server.dao.edge.EdgeService; import org.thingsboard.server.dao.entityview.EntityViewService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.dao.tenant.TenantService; @@ -95,6 +98,8 @@ public class EntitiesFieldsAsyncLoaderTest { private RuleChainService ruleChainServiceMock; @Mock private EntityViewService entityViewServiceMock; + @Mock + private EdgeService edgeServiceMock; @BeforeAll public static void setup() { @@ -108,7 +113,8 @@ public class EntitiesFieldsAsyncLoaderTest { EntityType.DEVICE, EntityType.ALARM, EntityType.RULE_CHAIN, - EntityType.ENTITY_VIEW + EntityType.ENTITY_VIEW, + EntityType.EDGE ); } @@ -228,6 +234,14 @@ public class EntitiesFieldsAsyncLoaderTest { when(ctxMock.getEntityViewService()).thenReturn(entityViewServiceMock); doReturn(entityView).when(entityViewServiceMock).findEntityViewByIdAsync(eq(TENANT_ID), any()); + break; + case EDGE: + var edge = Futures.immediateFuture(entityDoesNotExist ? null : new Edge(new EdgeId(RANDOM_UUID))); + + when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR); + when(ctxMock.getEdgeService()).thenReturn(edgeServiceMock); + doReturn(edge).when(edgeServiceMock).findEdgeByIdAsync(eq(TENANT_ID), any()); + break; default: throw new RuntimeException("Unexpected EntityType: " + entityType); @@ -252,6 +266,8 @@ public class EntitiesFieldsAsyncLoaderTest { return new RuleChain((RuleChainId) entityId); case ENTITY_VIEW: return new EntityView((EntityViewId) entityId); + case EDGE: + return new Edge((EdgeId) entityId); default: throw new RuntimeException("Unexpected EntityType: " + entityId.getEntityType()); } diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml index 688392d264..b6dc7248ab 100644 --- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml +++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml @@ -155,6 +155,8 @@ transport: dtls: # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000 retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}" + # "" disables connection id support, 0 enables support but not for incoming traffic, any value greater than 0 set the connection id size in bytes + connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:6}" server: # LwM2M Server ID id: "${LWM2M_SERVER_ID:123}" diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml index 805ab5a8dd..a40374e1f6 100644 --- a/transport/snmp/src/main/resources/tb-snmp-transport.yml +++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml @@ -128,14 +128,18 @@ transport: bind_port: "${SNMP_BIND_PORT:1620}" response_processing: # parallelism level for executor (workStealingPool) that is responsible for handling responses from SNMP devices - parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:20}" + parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:4}" # to configure SNMP to work over UDP or TCP underlying_protocol: "${SNMP_UNDERLYING_PROTOCOL:udp}" - # Batch size to request OID mappings from the device (useful when the device profile has multiple hundreds of OID mappings) + # Maximum size of a PDU (amount of OID mappings in a single SNMP request). The request will be split into multiple PDUs if mappings amount exceeds this number max_request_oids: "${SNMP_MAX_REQUEST_OIDS:100}" + # Delay after sending each request chunk (in case the request was split into multiple PDUs due to max_request_oids) + request_chunk_delay_ms: "${SNMP_REQUEST_CHUNK_DELAY_MS:100}" response: # To ignore SNMP response values that do not match the data type of the configured OID mapping (by default false - will throw an error if any value of the response not match configured data types) ignore_type_cast_errors: "${SNMP_RESPONSE_IGNORE_TYPE_CAST_ERRORS:false}" + # Thread pool size for scheduler that executes device querying tasks + scheduler_thread_pool_size: "${SNMP_SCHEDULER_THREAD_POOL_SIZE:4}" sessions: # Session inactivity timeout is a global configuration parameter that defines how long the device transport session will be opened after the last message arrives from the device. # The parameter value is in milliseconds. diff --git a/ui-ngx/package.json b/ui-ngx/package.json index 4bbe817fcf..ab60ebd525 100644 --- a/ui-ngx/package.json +++ b/ui-ngx/package.json @@ -44,6 +44,7 @@ "@ngrx/store-devtools": "^15.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", + "@svgdotjs/svg.filter.js": "^3.0.8", "@svgdotjs/svg.js": "^3.2.0", "@tinymce/tinymce-angular": "^7.0.0", "ace-builds": "1.4.13", diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts index 90d74a4c16..4b21a60b30 100644 --- a/ui-ngx/src/app/core/api/widget-api.models.ts +++ b/ui-ngx/src/app/core/api/widget-api.models.ts @@ -82,6 +82,7 @@ export interface RpcApi { export interface IWidgetUtils { formatValue: (value: any, dec?: number, units?: string, showZeroDecimals?: boolean) => string | undefined; + getEntityDetailsPageURL: (id: string, entityType: EntityType) => string; } export interface WidgetActionsApi { diff --git a/ui-ngx/src/app/core/http/image.service.ts b/ui-ngx/src/app/core/http/image.service.ts index 8df64be126..2339801e2b 100644 --- a/ui-ngx/src/app/core/http/image.service.ts +++ b/ui-ngx/src/app/core/http/image.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { PageLink } from '@shared/models/page/page-link'; import { defaultHttpOptionsFromConfig, defaultHttpUploadOptions, RequestConfig } from '@core/http/http-utils'; -import { Observable, of } from 'rxjs'; +import { Observable, of, ReplaySubject } from 'rxjs'; import { PageData } from '@shared/models/page/page-data'; import { NO_IMAGE_DATA_URI, @@ -36,6 +36,9 @@ import { ResourcesService } from '@core/services/resources.service'; providedIn: 'root' }) export class ImageService { + + private imagesLoading: { [url: string]: ReplaySubject } = {}; + constructor( private http: HttpClient, private sanitizer: DomSanitizer, @@ -95,12 +98,34 @@ export class ImageService { parts[parts.length - 1] = encodeURIComponent(key); const encodedUrl = parts.join('/'); const imageLink = preview ? (encodedUrl + '/preview') : encodedUrl; - const options = defaultHttpOptionsFromConfig({ignoreLoading: true, ignoreErrors: true}); - return this.http - .get(imageLink, {...options, ...{ responseType: 'blob' } }).pipe( + return this.loadImageDataUrl(imageLink, asString, emptyUrl); + } + + private loadImageDataUrl(imageLink: string, asString = false, emptyUrl = NO_IMAGE_DATA_URI): Observable { + let request: ReplaySubject; + if (this.imagesLoading[imageLink]) { + request = this.imagesLoading[imageLink]; + } else { + request = new ReplaySubject(1); + this.imagesLoading[imageLink] = request; + const options = defaultHttpOptionsFromConfig({ignoreLoading: true, ignoreErrors: true}); + this.http.get(imageLink, {...options, ...{ responseType: 'blob' } }).subscribe({ + next: (value) => { + request.next(value); + request.complete(); + }, + error: err => { + request.error(err); + }, + complete: () => { + delete this.imagesLoading[imageLink]; + } + }); + } + return request.pipe( switchMap(val => blobToBase64(val).pipe( - map((dataUrl) => asString ? dataUrl : this.sanitizer.bypassSecurityTrustUrl(dataUrl)) - )), + map((dataUrl) => asString ? dataUrl : this.sanitizer.bypassSecurityTrustUrl(dataUrl)) + )), catchError(() => of(asString ? emptyUrl : this.sanitizer.bypassSecurityTrustUrl(emptyUrl))) ); } diff --git a/ui-ngx/src/app/core/notification/notification.models.ts b/ui-ngx/src/app/core/notification/notification.models.ts index 1d658a5b9e..37e2177d62 100644 --- a/ui-ngx/src/app/core/notification/notification.models.ts +++ b/ui-ngx/src/app/core/notification/notification.models.ts @@ -33,6 +33,7 @@ export class NotificationMessage { horizontalPosition?: NotificationHorizontalPosition; verticalPosition?: NotificationVerticalPosition; panelClass?: string | string[]; + modern?: boolean; } export class HideNotification { diff --git a/ui-ngx/src/app/core/services/item-buffer.service.ts b/ui-ngx/src/app/core/services/item-buffer.service.ts index eeade82898..e1941590ea 100644 --- a/ui-ngx/src/app/core/services/item-buffer.service.ts +++ b/ui-ngx/src/app/core/services/item-buffer.service.ts @@ -27,7 +27,7 @@ import { widgetType } from '@shared/models/widget.models'; import { DashboardUtilsService } from '@core/services/dashboard-utils.service'; -import { deepClone, isEqual } from '@core/utils'; +import { deepClone, isDefinedAndNotNull, isEqual } from '@core/utils'; import { UtilsService } from '@core/services/utils.service'; import { Observable, of, throwError } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -309,6 +309,12 @@ export class ItemBufferService { if (origNode.error) { node.error = origNode.error; } + if (isDefinedAndNotNull(origNode.singletonMode)) { + node.singletonMode = origNode.singletonMode; + } + if (isDefinedAndNotNull(origNode.queueName)) { + node.queueName = origNode.queueName; + } ruleNodes.nodes.push(node); if (i === 0) { top = node.y; diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts index a12829f7c9..fcb4e0b411 100644 --- a/ui-ngx/src/app/modules/common/modules-map.ts +++ b/ui-ngx/src/app/modules/common/modules-map.ts @@ -194,6 +194,17 @@ import * as ScrollGridComponent from '@shared/components/grid/scroll-grid.compon import * as GalleryImageInputComponent from '@shared/components/image/gallery-image-input.component'; import * as MultipleGalleryImageInputComponent from '@shared/components/image/multiple-gallery-image-input.component'; +import * as CssUnitSelectComponent from '@home/components/widget/lib/settings/common/css-unit-select.component'; +import * as WidgetActionsPanelComponent from '@home/components/widget/config/basic/common/widget-actions-panel.component'; +import * as FontSettingsComponent from '@home/components/widget/lib/settings/common/font-settings.component'; +import * as ColorSettingsComponent from '@home/components/widget/lib/settings/common/color-settings.component'; +import * as DisplayColumnsPanelComponent from '@home/components/widget/lib/display-columns-panel.component'; +import * as AlarmDetailsDialogComponent from '@home/components/alarm/alarm-details-dialog.component'; +import * as AlarmAssigneePanelComponent from '@home/components/alarm/alarm-assignee-panel.component'; +import * as AlarmCommentDialogComponent from '@home/components/alarm/alarm-comment-dialog.component'; +import * as AlarmFilterConfigComponent from '@home/components/alarm/alarm-filter-config.component'; +import * as DatasourceComponent from '@home/components/widget/config/datasources.component'; +import * as DataKeysPanelComponent from '@home/components/widget/config/basic/common/data-keys-panel.component'; import * as AddEntityDialogComponent from '@home/components/entity/add-entity-dialog.component'; import * as EntitiesTableComponent from '@home/components/entity/entities-table.component'; import * as DetailsPanelComponent from '@home/components/details-panel.component'; @@ -239,6 +250,10 @@ import * as ImportDialogCsvComponent from '@shared/import-export/import-dialog-c import * as TableColumnsAssignmentComponent from '@shared/import-export/table-columns-assignment.component'; import * as EventContentDialogComponent from '@home/components/event/event-content-dialog.component'; import * as SharedHomeComponentsModule from '@home/components/shared-home-components.module'; +import * as WidgetConfigComponentsModule from '@home/components/widget/config/widget-config-components.module'; +import * as BasicWidgetConfigModule from '@home/components/widget/config/basic/basic-widget-config.module'; +import * as WidgetSettingsCommonModule from '@home/components/widget/lib/settings/common/widget-settings-common.module'; +import * as WidgetComponentsModule from '@home/components/widget/widget-components.module'; import * as SelectTargetLayoutDialogComponent from '@home/components/dashboard/select-target-layout-dialog.component'; import * as SelectTargetStateDialogComponent from '@home/components/dashboard/select-target-state-dialog.component'; import * as AliasesEntityAutocompleteComponent from '@home/components/alias/aliases-entity-autocomplete.component'; @@ -507,6 +522,17 @@ class ModulesMap implements IModulesMap { '@shared/components/image/gallery-image-input.component': GalleryImageInputComponent, '@shared/components/image/multiple-gallery-image-input.component': MultipleGalleryImageInputComponent, + '@home/components/alarm/alarm-filter-config.component': AlarmFilterConfigComponent, + '@home/components/alarm/alarm-comment-dialog.component': AlarmCommentDialogComponent, + '@home/components/alarm/alarm-assignee-panel.component': AlarmAssigneePanelComponent, + '@home/components/alarm/alarm-details-dialog.component': AlarmDetailsDialogComponent, + '@home/components/widget/lib/display-columns-panel.component': DisplayColumnsPanelComponent, + '@home/components/widget/config/datasources.component': DatasourceComponent, + '@home/components/widget/config/basic/common/data-keys-panel.component': DataKeysPanelComponent, + '@home/components/widget/lib/settings/common/color-settings.component': ColorSettingsComponent, + '@home/components/widget/lib/settings/common/font-settings.component': FontSettingsComponent, + '@home/components/widget/config/basic/common/widget-actions-panel.component': WidgetActionsPanelComponent, + '@home/components/widget/lib/settings/common/css-unit-select.component': CssUnitSelectComponent, '@home/components/entity/add-entity-dialog.component': AddEntityDialogComponent, '@home/components/entity/entities-table.component': EntitiesTableComponent, '@home/components/details-panel.component': DetailsPanelComponent, @@ -549,6 +575,10 @@ class ModulesMap implements IModulesMap { '@home/components/attribute/add-widget-to-dashboard-dialog.component': AddWidgetToDashboardDialogComponent, '@home/components/event/event-content-dialog.component': EventContentDialogComponent, '@home/components/shared-home-components.module': SharedHomeComponentsModule, + '@home/components/widget/config/widget-config-components.module': WidgetConfigComponentsModule, + '@home/components/widget/config/basic/basic-widget-config.module': BasicWidgetConfigModule, + '@home/components/widget/lib/settings/common/widget-settings-common.module': WidgetSettingsCommonModule, + '@home/components/widget/widget-components.module': WidgetComponentsModule, '@home/components/dashboard/select-target-layout-dialog.component': SelectTargetLayoutDialogComponent, '@home/components/dashboard/select-target-state-dialog.component': SelectTargetStateDialogComponent, '@home/components/alias/aliases-entity-autocomplete.component': AliasesEntityAutocompleteComponent, diff --git a/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.ts b/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.ts index 2d143f4e16..6cc1ec7dbe 100644 --- a/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.ts +++ b/ui-ngx/src/app/modules/home/components/dashboard/dashboard.component.ts @@ -214,7 +214,7 @@ export class DashboardComponent extends PageComponent implements IDashboardCompo disableAutoPositionOnConflict: false, pushItems: false, swap: false, - maxRows: 100, + maxRows: 3000, minCols: this.columns ? this.columns : 24, maxCols: 3000, maxItemCols: 1000, @@ -293,12 +293,12 @@ export class DashboardComponent extends PageComponent implements IDashboardCompo this.dashboardTimewindowChangedSubject.next(this.dashboardTimewindow); } - if (updateMobileOpts) { - this.updateMobileOpts(); - } if (updateLayoutOpts) { this.updateLayoutOpts(); } + if (updateMobileOpts) { + this.updateMobileOpts(); + } if (updateEditingOpts) { this.updateEditingOpts(); } diff --git a/ui-ngx/src/app/modules/home/components/filter/filters-edit.component.ts b/ui-ngx/src/app/modules/home/components/filter/filters-edit.component.ts index 080fd3e576..a37ae90dc0 100644 --- a/ui-ngx/src/app/modules/home/components/filter/filters-edit.component.ts +++ b/ui-ngx/src/app/modules/home/components/filter/filters-edit.component.ts @@ -119,7 +119,7 @@ export class FiltersEditComponent implements OnInit, OnDestroy { const filteredArray = Object.entries(this.filtersInfo); if (filteredArray.length === 1) { - const singleFilter: Filter = {id: filteredArray[0][0], ...filteredArray[0][1]}; + const singleFilter: Filter = {id: filteredArray[0][0], ...deepClone(filteredArray[0][1])}; this.dialog.open(UserFilterDialogComponent, { disableClose: true, diff --git a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.html b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.html index 1b1d97ae06..de80b9f238 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.html @@ -19,7 +19,7 @@
-
+
device-profile.snmp.scope diff --git a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.scss b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.scss index 027e82c89c..e7877699b5 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.scss +++ b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-communication-config.component.scss @@ -13,12 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +@import '../scss/constants'; + :host { .communication-config { border: 2px groove rgba(0, 0, 0, 0.25); border-radius: 4px; padding: 8px; min-width: 0; + flex-direction: column; + display: flex; + place-content: stretch flex-start; + align-items: stretch; + flex: 1; + gap: 0; } .scope-row { @@ -28,6 +36,13 @@ .required-text { margin: 16px 0 } + + @media #{$mat-gt-xmd} { + .communication-config { + flex-direction: row; + gap: 8px; + } + } } :host ::ng-deep { diff --git a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.html b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.html index f56bfa9255..8b4b656c02 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.html @@ -19,8 +19,8 @@
- - + +
@@ -28,7 +28,7 @@
-
+
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.scss b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.scss index d9ad3d7923..01ff5a71e2 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.scss +++ b/ui-ngx/src/app/modules/home/components/profile/device/snmp/snmp-device-profile-mapping.component.scss @@ -15,13 +15,9 @@ */ :host { .mapping-config { - min-width: 518px; - } - .mapping-list { - padding-bottom: 8px; - } - .required-text { - margin: 14px 0; + .required-text { + margin: 14px 0; + } } } diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html index 4c309f5e80..867cd74f3b 100644 --- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html @@ -523,7 +523,7 @@ -
+
@@ -531,7 +531,7 @@ [type]="rateLimitsType.DEVICE_TELEMETRY_DATA_POINTS">
-
+
@@ -539,7 +539,7 @@ [type]="rateLimitsType.CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION">
-
+
@@ -547,7 +547,7 @@ [type]="rateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT">
-
+
@@ -555,7 +555,7 @@ [type]="rateLimitsType.CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION">
-
+
@@ -563,6 +563,14 @@ [type]="rateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT">
+
+ + + + +
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts index a0b8770509..0c95324d85 100644 --- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts +++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts @@ -106,7 +106,9 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA maxWsSubscriptionsPerRegularUser: [null, [Validators.min(0)]], maxWsSubscriptionsPerPublicUser: [null, [Validators.min(0)]], wsUpdatesPerSessionRateLimit: [null, []], - cassandraQueryTenantRateLimitsConfiguration: [null, []] + cassandraQueryTenantRateLimitsConfiguration: [null, []], + edgeEventRateLimits: [null, []], + edgeEventRateLimitsPerEdge: [null, []] }); this.defaultTenantProfileConfigurationFormGroup.get('smsEnabled').valueChanges.pipe( diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts index 257752f5f4..8924682aa1 100644 --- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts +++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts @@ -35,7 +35,9 @@ export enum RateLimitsType { TENANT_ENTITY_EXPORT_RATE_LIMIT = 'TENANT_ENTITY_EXPORT_RATE_LIMIT', TENANT_ENTITY_IMPORT_RATE_LIMIT = 'TENANT_ENTITY_IMPORT_RATE_LIMIT', TENANT_NOTIFICATION_REQUEST_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUEST_RATE_LIMIT', - TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT' + TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT', + EDGE_EVENTS_RATE_LIMIT = 'EDGE_EVENTS_RATE_LIMIT', + EDGE_EVENTS_PER_EDGE_RATE_LIMIT = 'EDGE_EVENTS_PER_EDGE_RATE_LIMIT' } export const rateLimitsLabelTranslationMap = new Map( @@ -54,6 +56,8 @@ export const rateLimitsLabelTranslationMap = new Map( [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.tenant-entity-import-rate-limit'], [RateLimitsType.TENANT_NOTIFICATION_REQUEST_RATE_LIMIT, 'tenant-profile.tenant-notification-request-rate-limit'], [RateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT, 'tenant-profile.tenant-notification-requests-per-rule-rate-limit'], + [RateLimitsType.EDGE_EVENTS_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-rate-limit'], + [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-per-edge-rate-limit'], ] ); @@ -73,6 +77,8 @@ export const rateLimitsDialogTitleTranslationMap = new Map
- + -
+
diff --git a/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.ts b/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.ts index e65658ea53..2cdef0dea4 100644 --- a/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/vc/repository-settings.component.ts @@ -34,6 +34,7 @@ import { selectHasRepository } from '@core/auth/auth.selectors'; import { catchError, mergeMap, take } from 'rxjs/operators'; import { of } from 'rxjs'; import { TbPopoverComponent } from '@shared/components/popover.component'; +import { coerceBoolean } from '@shared/decorators/coercion'; @Component({ selector: 'tb-repository-settings', @@ -48,6 +49,10 @@ export class RepositorySettingsComponent extends PageComponent implements OnInit @Input() popoverComponent: TbPopoverComponent; + @Input() + @coerceBoolean() + hideLoadingBar = false; + repositorySettingsForm: UntypedFormGroup; settings: RepositorySettings = null; diff --git a/ui-ngx/src/app/modules/home/components/vc/version-control.component.html b/ui-ngx/src/app/modules/home/components/vc/version-control.component.html index 4495ce5c5e..eb4b1d962b 100644 --- a/ui-ngx/src/app/modules/home/components/vc/version-control.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/version-control.component.html @@ -15,9 +15,11 @@ limitations under the License. --> - + *ngIf="!(hasRepository$ | async); else versionsTable"> + + +
+
widgets.power-button.behavior
+
+
widgets.rpc-state.initial-state
+ +
+
+
widgets.power-button.power-on
+ +
+
+
widgets.power-button.power-off
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.appearance
+ + + {{ powerButtonLayoutTranslationMap.get(layout) | translate }} + + +
+ + {{ 'widget-config.title' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widget-config.card-icon' | translate }} + +
+ + + + + + + + +
+
+
+
{{ 'widgets.power-button.power-on-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+
{{ 'widgets.power-button.power-off-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+
{{ 'widgets.power-button.disabled-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+
+
widget-config.card-appearance
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+ + + diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts new file mode 100644 index 0000000000..174ded9ed3 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.ts @@ -0,0 +1,195 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models'; +import { WidgetConfigComponentData } from '@home/models/widget-component.models'; +import { TargetDevice, WidgetConfig, } from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { isUndefined } from '@core/utils'; +import { ValueType } from '@shared/models/constants'; +import { + powerButtonDefaultSettings, + powerButtonLayoutImages, + powerButtonLayouts, + powerButtonLayoutTranslations, + PowerButtonWidgetSettings +} from '@home/components/widget/lib/rpc/power-button-widget.models'; +import { cssSizeToStrSize, resolveCssSize } from '@shared/models/widget-settings.models'; + +@Component({ + selector: 'tb-power-button-basic-config', + templateUrl: './power-button-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class PowerButtonBasicConfigComponent extends BasicWidgetConfigComponent { + + get targetDevice(): TargetDevice { + return this.powerButtonWidgetConfigForm.get('targetDevice').value; + } + + powerButtonLayouts = powerButtonLayouts; + + powerButtonLayoutTranslationMap = powerButtonLayoutTranslations; + powerButtonLayoutImageMap = powerButtonLayoutImages; + + valueType = ValueType; + + powerButtonWidgetConfigForm: UntypedFormGroup; + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.powerButtonWidgetConfigForm; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: PowerButtonWidgetSettings = {...powerButtonDefaultSettings, ...(configData.config.settings || {})}; + const iconSize = resolveCssSize(configData.config.iconSize); + this.powerButtonWidgetConfigForm = this.fb.group({ + targetDevice: [configData.config.targetDevice, []], + + initialState: [settings.initialState, []], + onUpdateState: [settings.onUpdateState, []], + offUpdateState: [settings.offUpdateState, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + + showTitle: [configData.config.showTitle, []], + title: [configData.config.title, []], + titleFont: [configData.config.titleFont, []], + titleColor: [configData.config.titleColor, []], + + showIcon: [configData.config.showTitleIcon, []], + iconSize: [iconSize[0], [Validators.min(0)]], + iconSizeUnit: [iconSize[1], []], + icon: [configData.config.titleIcon, []], + iconColor: [configData.config.iconColor, []], + + mainColorOn: [settings.mainColorOn, []], + backgroundColorOn: [settings.backgroundColorOn, []], + + mainColorOff: [settings.mainColorOff, []], + backgroundColorOff: [settings.backgroundColorOff, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + this.widgetConfig.config.targetDevice = config.targetDevice; + + this.widgetConfig.config.showTitle = config.showTitle; + this.widgetConfig.config.title = config.title; + this.widgetConfig.config.titleFont = config.titleFont; + this.widgetConfig.config.titleColor = config.titleColor; + + this.widgetConfig.config.showTitleIcon = config.showIcon; + this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit); + this.widgetConfig.config.titleIcon = config.icon; + this.widgetConfig.config.iconColor = config.iconColor; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.initialState = config.initialState; + this.widgetConfig.config.settings.onUpdateState = config.onUpdateState; + this.widgetConfig.config.settings.offUpdateState = config.offUpdateState; + this.widgetConfig.config.settings.disabledState = config.disabledState; + + this.widgetConfig.config.settings.layout = config.layout; + + this.widgetConfig.config.settings.mainColorOn = config.mainColorOn; + this.widgetConfig.config.settings.backgroundColorOn = config.backgroundColorOn; + + this.widgetConfig.config.settings.mainColorOff = config.mainColorOff; + this.widgetConfig.config.settings.backgroundColorOff = config.backgroundColorOff; + + this.widgetConfig.config.settings.mainColorDisabled = config.mainColorDisabled; + this.widgetConfig.config.settings.backgroundColorDisabled = config.backgroundColorDisabled; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showTitle', 'showIcon']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showTitle: boolean = this.powerButtonWidgetConfigForm.get('showTitle').value; + const showIcon: boolean = this.powerButtonWidgetConfigForm.get('showIcon').value; + if (showTitle) { + this.powerButtonWidgetConfigForm.get('title').enable(); + this.powerButtonWidgetConfigForm.get('titleFont').enable(); + this.powerButtonWidgetConfigForm.get('titleColor').enable(); + this.powerButtonWidgetConfigForm.get('showIcon').enable({emitEvent: false}); + if (showIcon) { + this.powerButtonWidgetConfigForm.get('iconSize').enable(); + this.powerButtonWidgetConfigForm.get('iconSizeUnit').enable(); + this.powerButtonWidgetConfigForm.get('icon').enable(); + this.powerButtonWidgetConfigForm.get('iconColor').enable(); + } else { + this.powerButtonWidgetConfigForm.get('iconSize').disable(); + this.powerButtonWidgetConfigForm.get('iconSizeUnit').disable(); + this.powerButtonWidgetConfigForm.get('icon').disable(); + this.powerButtonWidgetConfigForm.get('iconColor').disable(); + } + } else { + this.powerButtonWidgetConfigForm.get('title').disable(); + this.powerButtonWidgetConfigForm.get('titleFont').disable(); + this.powerButtonWidgetConfigForm.get('titleColor').disable(); + this.powerButtonWidgetConfigForm.get('showIcon').disable({emitEvent: false}); + this.powerButtonWidgetConfigForm.get('iconSize').disable(); + this.powerButtonWidgetConfigForm.get('iconSizeUnit').disable(); + this.powerButtonWidgetConfigForm.get('icon').disable(); + this.powerButtonWidgetConfigForm.get('iconColor').disable(); + } + } + + private getCardButtons(config: WidgetConfig): string[] { + const buttons: string[] = []; + if (isUndefined(config.enableFullscreen) || config.enableFullscreen) { + buttons.push('fullscreen'); + } + return buttons; + } + + private setCardButtons(buttons: string[], config: WidgetConfig) { + config.enableFullscreen = buttons.includes('fullscreen'); + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html index 249acae52a..9f8d580bbc 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html @@ -86,7 +86,7 @@
-
+
{{ 'widgets.progress-bar.value' | translate }} @@ -104,7 +104,7 @@
-
+
{{ 'widgets.progress-bar.range' | translate }}
widgets.progress-bar.min
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html index d79947185b..b00a89969b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html @@ -34,7 +34,7 @@ {{ 'widgets.liquid-level-card.title' | translate }} -
+
@@ -49,7 +49,7 @@ {{ 'widgets.liquid-level-card.icon' | translate }} -
+
@@ -64,7 +64,7 @@
-
+
widgets.liquid-level-card.shape
@@ -96,7 +96,7 @@ formControlName="shapeAttributeName">
-
+
widgets.liquid-level-card.shape-by-attribute
widgets.liquid-level-card.units
widgets.liquid-level-card.datasource-units
-
+
-
+
widgets.liquid-level-card.widget-units
-
+
@@ -154,9 +154,9 @@
-
+
widgets.liquid-level-card.total-volume
-
+
@@ -184,10 +184,30 @@ formControlName="volumeAttributeName"> - +
+
+
widgets.liquid-level-card.total-volume-units
+
+ + + + {{ DataSourceTypeTranslations.get(type) | translate }} + + + + + + + +
@@ -206,7 +226,7 @@
widgets.liquid-level-card.value
-
+
@@ -221,7 +241,7 @@
widgets.liquid-level-card.total-volume
-
+
@@ -247,7 +267,7 @@ {{ 'widgets.liquid-level-card.level' | translate }} -
+
@@ -268,7 +288,7 @@ {{ 'widgets.value-card.date' | translate }} -
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts index b246ed2db1..0fc034d496 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts @@ -194,7 +194,9 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon volumeSource: [settings.volumeSource, []], volumeConstant: [settings.volumeConstant, [Validators.required, Validators.min(0.1)]], volumeAttributeName: [settings.volumeAttributeName, [Validators.required]], + volumeUnitsSource: [settings.volumeUnitsSource, []], volumeUnits: [settings.volumeUnits, [Validators.required]], + volumeUnitsAttributeName: [settings.volumeUnitsAttributeName, [Validators.required]], volumeFont: [settings.volumeFont, []], volumeColor: [settings.volumeColor, []], units: [settings.units, [Validators.required]], @@ -260,6 +262,8 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon this.widgetConfig.config.settings.volumeSource = config.volumeSource; this.widgetConfig.config.settings.volumeConstant = config.volumeConstant; this.widgetConfig.config.settings.volumeAttributeName = config.volumeAttributeName; + this.widgetConfig.config.settings.volumeUnitsSource = config.volumeUnitsSource; + this.widgetConfig.config.settings.volumeUnitsAttributeName = config.volumeUnitsAttributeName; this.widgetConfig.config.settings.volumeUnits = config.volumeUnits; this.widgetConfig.config.settings.volumeFont = config.volumeFont; this.widgetConfig.config.settings.volumeColor = config.volumeColor; @@ -294,7 +298,7 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon protected validatorTriggers(): string[] { return [ 'showTooltip', 'showTooltipLevel', 'tankSelectionType', 'datasourceUnits', 'showTitleIcon', 'volumeSource', - 'showTooltipDate', 'layout', 'showTitle', 'widgetUnitsSource' + 'showTooltipDate', 'layout', 'showTitle', 'widgetUnitsSource', 'volumeUnitsSource' ]; } diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html index 18fa3b5587..c6ac3abb45 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html @@ -82,7 +82,7 @@ {{ 'widgets.single-switch.auto-scale' | translate }}
-
+
{{ 'widgets.single-switch.label' | translate }} @@ -99,7 +99,7 @@
-
+
{{ 'widgets.single-switch.icon' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html new file mode 100644 index 0000000000..a8d84d4dc4 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html @@ -0,0 +1,271 @@ + + + +
+
widgets.slider.behavior
+
+
widgets.slider.initial-value
+ +
+
+
widgets.slider.on-value-change
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.appearance
+ + + {{ sliderLayoutTranslationMap.get(layout) | translate }} + + +
+ + {{ 'widgets.slider.auto-scale' | translate }} + +
+
+ + {{ 'widget-config.title' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widgets.slider.icon' | translate }} + +
+ + + + + + + + +
+
+
+ + {{ 'widgets.slider.value' | translate }} + +
+ + + +
widget-config.decimals-suffix
+ + + + + +
+
+
+
{{ 'widgets.slider.range' | translate }}
+
+
widgets.slider.min
+ + + +
widgets.slider.max
+ + + +
+
+
+ + {{ 'widgets.slider.range-ticks' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.slider.tick-marks' | translate }} + +
+ + + + + +
+
+
+
{{ 'widgets.slider.colors' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
{{ 'widgets.rpc-state.disabled-state' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
+ {{ 'widgets.slider.left-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+ {{ 'widgets.slider.right-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+
widget-config.card-appearance
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+ + + diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts new file mode 100644 index 0000000000..b80c6acb08 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts @@ -0,0 +1,309 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models'; +import { WidgetConfigComponentData } from '@home/models/widget-component.models'; +import { TargetDevice, WidgetConfig, } from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { formatValue, isUndefined } from '@core/utils'; +import { ValueType } from '@shared/models/constants'; +import { + SliderLayout, + sliderLayoutImages, + sliderLayouts, + sliderLayoutTranslations, + sliderWidgetDefaultSettings, + SliderWidgetSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { cssSizeToStrSize, resolveCssSize } from '@shared/models/widget-settings.models'; + +@Component({ + selector: 'tb-slider-basic-config', + templateUrl: './slider-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class SliderBasicConfigComponent extends BasicWidgetConfigComponent { + + get targetDevice(): TargetDevice { + return this.sliderWidgetConfigForm.get('targetDevice').value; + } + + sliderLayout = SliderLayout; + + sliderLayouts = sliderLayouts; + + sliderLayoutTranslationMap = sliderLayoutTranslations; + sliderLayoutImageMap = sliderLayoutImages; + + valueType = ValueType; + + sliderWidgetConfigForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.sliderWidgetConfigForm; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: SliderWidgetSettings = {...sliderWidgetDefaultSettings, ...(configData.config.settings || {})}; + const iconSize = resolveCssSize(configData.config.iconSize); + this.sliderWidgetConfigForm = this.fb.group({ + targetDevice: [configData.config.targetDevice, []], + + initialState: [settings.initialState, []], + valueChange: [settings.valueChange, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + autoScale: [settings.autoScale, []], + + showTitle: [configData.config.showTitle, []], + title: [configData.config.title, []], + titleFont: [configData.config.titleFont, []], + titleColor: [configData.config.titleColor, []], + + showIcon: [configData.config.showTitleIcon, []], + iconSize: [iconSize[0], [Validators.min(0)]], + iconSizeUnit: [iconSize[1], []], + icon: [configData.config.titleIcon, []], + iconColor: [configData.config.iconColor, []], + + showValue: [settings.showValue, []], + valueUnits: [settings.valueUnits, []], + valueDecimals: [settings.valueDecimals, []], + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + tickMin: [settings.tickMin, []], + tickMax: [settings.tickMax, []], + + showTicks: [settings.showTicks, []], + ticksFont: [settings.ticksFont, []], + ticksColor: [settings.ticksColor, []], + + showTickMarks: [settings.showTickMarks, []], + tickMarksCount: [settings.tickMarksCount, [Validators.min(2)]], + tickMarksColor: [settings.tickMarksColor, []], + + mainColor: [settings.mainColor, []], + backgroundColor: [settings.backgroundColor, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + leftIconSize: [settings.leftIconSize, [Validators.min(0)]], + leftIconSizeUnit: [settings.leftIconSizeUnit, []], + leftIcon: [settings.leftIcon, []], + leftIconColor: [settings.leftIconColor, []], + + rightIconSize: [settings.rightIconSize, [Validators.min(0)]], + rightIconSizeUnit: [settings.rightIconSizeUnit, []], + rightIcon: [settings.rightIcon, []], + rightIconColor: [settings.rightIconColor, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + this.widgetConfig.config.targetDevice = config.targetDevice; + + this.widgetConfig.config.showTitle = config.showTitle; + this.widgetConfig.config.title = config.title; + this.widgetConfig.config.titleFont = config.titleFont; + this.widgetConfig.config.titleColor = config.titleColor; + + this.widgetConfig.config.showTitleIcon = config.showIcon; + this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit); + this.widgetConfig.config.titleIcon = config.icon; + this.widgetConfig.config.iconColor = config.iconColor; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.initialState = config.initialState; + this.widgetConfig.config.settings.valueChange = config.valueChange; + this.widgetConfig.config.settings.disabledState = config.disabledState; + + this.widgetConfig.config.settings.layout = config.layout; + this.widgetConfig.config.settings.autoScale = config.autoScale; + + this.widgetConfig.config.settings.showValue = config.showValue; + this.widgetConfig.config.settings.valueUnits = config.valueUnits; + this.widgetConfig.config.settings.valueDecimals = config.valueDecimals; + this.widgetConfig.config.settings.valueFont = config.valueFont; + this.widgetConfig.config.settings.valueColor = config.valueColor; + + this.widgetConfig.config.settings.tickMin = config.tickMin; + this.widgetConfig.config.settings.tickMax = config.tickMax; + + this.widgetConfig.config.settings.showTicks = config.showTicks; + this.widgetConfig.config.settings.ticksFont = config.ticksFont; + this.widgetConfig.config.settings.ticksColor = config.ticksColor; + + this.widgetConfig.config.settings.showTickMarks = config.showTickMarks; + this.widgetConfig.config.settings.tickMarksCount = config.tickMarksCount; + this.widgetConfig.config.settings.tickMarksColor = config.tickMarksColor; + + this.widgetConfig.config.settings.mainColor = config.mainColor; + this.widgetConfig.config.settings.backgroundColor = config.backgroundColor; + + this.widgetConfig.config.settings.mainColorDisabled = config.mainColorDisabled; + this.widgetConfig.config.settings.backgroundColorDisabled = config.backgroundColorDisabled; + + this.widgetConfig.config.settings.leftIconSize = config.leftIconSize; + this.widgetConfig.config.settings.leftIconSizeUnit = config.leftIconSizeUnit; + this.widgetConfig.config.settings.leftIcon = config.leftIcon; + this.widgetConfig.config.settings.leftIconColor = config.leftIconColor; + + this.widgetConfig.config.settings.rightIconSize = config.rightIconSize; + this.widgetConfig.config.settings.rightIconSizeUnit = config.rightIconSizeUnit; + this.widgetConfig.config.settings.rightIcon = config.rightIcon; + this.widgetConfig.config.settings.rightIconColor = config.rightIconColor; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showTitle', 'showIcon', 'showValue', 'showTicks', 'showTickMarks', 'layout']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showTitle: boolean = this.sliderWidgetConfigForm.get('showTitle').value; + const showIcon: boolean = this.sliderWidgetConfigForm.get('showIcon').value; + const showValue: boolean = this.sliderWidgetConfigForm.get('showValue').value; + const showTicks: boolean = this.sliderWidgetConfigForm.get('showTicks').value; + const showTickMarks: boolean = this.sliderWidgetConfigForm.get('showTickMarks').value; + const layout: SliderLayout = this.sliderWidgetConfigForm.get('layout').value; + + const valueEnabled = layout !== SliderLayout.simplified; + const leftRightIconsEnabled = layout === SliderLayout.extended; + + if (showTitle) { + this.sliderWidgetConfigForm.get('title').enable(); + this.sliderWidgetConfigForm.get('titleFont').enable(); + this.sliderWidgetConfigForm.get('titleColor').enable(); + this.sliderWidgetConfigForm.get('showIcon').enable({emitEvent: false}); + if (showIcon) { + this.sliderWidgetConfigForm.get('iconSize').enable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('icon').enable(); + this.sliderWidgetConfigForm.get('iconColor').enable(); + } else { + this.sliderWidgetConfigForm.get('iconSize').disable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('icon').disable(); + this.sliderWidgetConfigForm.get('iconColor').disable(); + } + } else { + this.sliderWidgetConfigForm.get('title').disable(); + this.sliderWidgetConfigForm.get('titleFont').disable(); + this.sliderWidgetConfigForm.get('titleColor').disable(); + this.sliderWidgetConfigForm.get('showIcon').disable({emitEvent: false}); + this.sliderWidgetConfigForm.get('iconSize').disable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('icon').disable(); + this.sliderWidgetConfigForm.get('iconColor').disable(); + } + + if (valueEnabled && showValue) { + this.sliderWidgetConfigForm.get('valueUnits').enable(); + this.sliderWidgetConfigForm.get('valueDecimals').enable(); + this.sliderWidgetConfigForm.get('valueFont').enable(); + this.sliderWidgetConfigForm.get('valueColor').enable(); + } else { + this.sliderWidgetConfigForm.get('valueUnits').disable(); + this.sliderWidgetConfigForm.get('valueDecimals').disable(); + this.sliderWidgetConfigForm.get('valueFont').disable(); + this.sliderWidgetConfigForm.get('valueColor').disable(); + } + + if (showTicks) { + this.sliderWidgetConfigForm.get('ticksFont').enable(); + this.sliderWidgetConfigForm.get('ticksColor').enable(); + } else { + this.sliderWidgetConfigForm.get('ticksFont').disable(); + this.sliderWidgetConfigForm.get('ticksColor').disable(); + } + + if (showTickMarks) { + this.sliderWidgetConfigForm.get('tickMarksCount').enable(); + this.sliderWidgetConfigForm.get('tickMarksColor').enable(); + } else { + this.sliderWidgetConfigForm.get('tickMarksCount').disable(); + this.sliderWidgetConfigForm.get('tickMarksColor').disable(); + } + + if (leftRightIconsEnabled) { + this.sliderWidgetConfigForm.get('leftIconSize').enable(); + this.sliderWidgetConfigForm.get('leftIconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('leftIcon').enable(); + this.sliderWidgetConfigForm.get('leftIconColor').enable(); + this.sliderWidgetConfigForm.get('rightIconSize').enable(); + this.sliderWidgetConfigForm.get('rightIconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('rightIcon').enable(); + this.sliderWidgetConfigForm.get('rightIconColor').enable(); + } else { + this.sliderWidgetConfigForm.get('leftIconSize').disable(); + this.sliderWidgetConfigForm.get('leftIconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('leftIcon').disable(); + this.sliderWidgetConfigForm.get('leftIconColor').disable(); + this.sliderWidgetConfigForm.get('rightIconSize').disable(); + this.sliderWidgetConfigForm.get('rightIconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('rightIcon').disable(); + this.sliderWidgetConfigForm.get('rightIconColor').disable(); + } + } + + private getCardButtons(config: WidgetConfig): string[] { + const buttons: string[] = []; + if (isUndefined(config.enableFullscreen) || config.enableFullscreen) { + buttons.push('fullscreen'); + } + return buttons; + } + + private setCardButtons(buttons: string[], config: WidgetConfig) { + config.enableFullscreen = buttons.includes('fullscreen'); + } + + private _valuePreviewFn(): string { + const units: string = this.sliderWidgetConfigForm.get('valueUnits').value; + const decimals: number = this.sliderWidgetConfigForm.get('valueDecimals').value; + return formatValue(48, decimals, units, false); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts index 26dc76866a..cac6928bac 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts @@ -62,8 +62,6 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A loading$ = this.loadingSubject.asObservable().pipe(share()); - error = ''; - protected constructor(protected cd: ChangeDetectorRef) { } @@ -91,14 +89,15 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A ngOnDestroy() { this.valueActions.forEach(v => v.destroy()); + this.loadingSubject.complete(); + this.loadingSubject.unsubscribe(); } public onInit() { } public clearError() { - this.error = ''; - this.cd.markForCheck(); + this.ctx.hideToast(this.ctx.toastTargetId); } protected createValueGetter(getValueSettings: GetValueSettings, @@ -111,7 +110,8 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A } }, error: (err: any) => { - this.onError(err); + const message = parseError(this.ctx, err); + this.onError(message); if (valueObserver?.error) { valueObserver.error(err); } @@ -130,8 +130,7 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A } private onError(error: string) { - this.error = error; - this.cd.markForCheck(); + this.ctx.showErrorToast(error, 'bottom', 'center', this.ctx.toastTargetId, true); } protected updateValue(valueSetter: ValueSetter, @@ -293,6 +292,8 @@ export class ValueToDataConverter { constructor(protected settings: ValueToDataSettings) { switch (settings.type) { + case ValueToDataType.VALUE: + break; case ValueToDataType.CONSTANT: this.constantValue = this.settings.constantValue; break; @@ -310,6 +311,8 @@ export class ValueToDataConverter { valueToData(value: V): any { switch (this.settings.type) { + case ValueToDataType.VALUE: + return value; case ValueToDataType.CONSTANT: return this.constantValue; case ValueToDataType.FUNCTION: diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss index 6641c2c32e..081cb00f0d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss @@ -19,34 +19,3 @@ left: 0; right: 0; } -.tb-action-widget-error-container { - position: absolute; - bottom: 0; - left: 0; - right: 0; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - z-index: 1; - .tb-action-widget-error-panel { - display: flex; - padding: 4px 4px 4px 12px; - justify-content: center; - align-items: center; - gap: 4px; - border-radius: 4px; - background-color: #fff2f3; - box-shadow: -2px 2px 4px 0px rgba(0,0,0,0.2); - .tb-action-widget-error-text { - font-size: 12px; - font-style: normal; - font-weight: 400; - line-height: 16px; - color: rgba(209, 39, 48, 1); - } - .tb-action-widget-error-clear { - color: rgba(209, 39, 48, 1); - } - } -} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html index 02e2406859..294ba855fe 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html @@ -27,10 +27,4 @@ [ctx]="ctx" (clicked)="onClick($event)"> -
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html index 26f910fdd7..d48ba2f5e4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html @@ -27,10 +27,4 @@ (clicked)="onClick($event)"> -
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts index af3bd41caa..25be87451e 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts @@ -241,8 +241,8 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit } else { aggValue.value = 'N/A'; } + aggValue.color.update(value); const numeric = formatNumberValue(value, (aggValue.key.decimals || this.ctx.decimals)); - aggValue.color.update(numeric); if (aggValue.showArrow && isDefined(numeric)) { aggValue.upArrow = numeric > 0; aggValue.downArrow = numeric < 0; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts index e43f22ff71..1c65920179 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts @@ -127,11 +127,11 @@ export class GatewayConfigurationComponent implements OnInit { type: [StorageTypes.MEMORY, [Validators.required]], read_records_count: [100, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required, Validators.pattern(/^[^.\s]+$/)]], max_records_count: [100000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required, Validators.pattern(/^[^.\s]+$/)]], - data_folder_path: ['./data/', [Validators.pattern(/^[^\s]+$/)]], + data_folder_path: ['./data/', [Validators.required]], max_file_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], max_read_records_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], max_records_per_file: [10000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], - data_file_path: ['./data/data.db', [Validators.pattern(/^[^\s]+$/)]], + data_file_path: ['./data/data.db', [Validators.required]], messages_ttl_check_in_hours: [1, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], messages_ttl_in_days: [7, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], @@ -240,7 +240,7 @@ export class GatewayConfigurationComponent implements OnInit { storageGroup.get('read_records_count').updateValueAndValidity({emitEvent: false}); storageGroup.get('max_records_count').updateValueAndValidity({emitEvent: false}); } else if (type === StorageTypes.FILE) { - storageGroup.get('data_folder_path').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); + storageGroup.get('data_folder_path').addValidators([Validators.required]); storageGroup.get('max_file_count').addValidators( [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); storageGroup.get('max_read_records_count').addValidators( @@ -252,7 +252,7 @@ export class GatewayConfigurationComponent implements OnInit { storageGroup.get('max_read_records_count').updateValueAndValidity({emitEvent: false}); storageGroup.get('max_records_per_file').updateValueAndValidity({emitEvent: false}); } else if (type === StorageTypes.SQLITE) { - storageGroup.get('data_file_path').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); + storageGroup.get('data_file_path').addValidators([Validators.required]); storageGroup.get('messages_ttl_check_in_hours').addValidators( [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); storageGroup.get('messages_ttl_in_days').addValidators( diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html index 8182920805..2b9329dc21 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html @@ -80,7 +80,7 @@ + [ngStyle.gt-md]="{ minWidth: '144px', maxWidth: '144px', width: '144px', textAlign: 'center'}"> {{ 'gateway.connectors-table-actions' | translate }} section:not(.table-section) { + max-width: unset; + @media #{$mat-gt-md} { + max-width: 50%; + } + } + .table-section { min-height: 35vh; overflow: hidden; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts index a9465fc65b..8071a2f924 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts @@ -366,7 +366,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie type: 'success', duration: 1000, verticalPosition: 'top', - horizontalPosition: 'right', + horizontalPosition: 'left', target: 'dashboardRoot', forceDismiss: true })); @@ -381,6 +381,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie if ($event) { $event.stopPropagation(); } + this.initialConnector = attribute.value; const title = `Delete connector ${attribute.key}?`; const content = `All connector data will be deleted.`; this.dialogService.confirm(title, content, 'Cancel', 'Delete').subscribe(result => { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts index 3c79883bf3..0933bfe537 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts @@ -106,6 +106,7 @@ export class LiquidLevelWidgetComponent implements OnInit { private volume: number; private tooltipContent: string; private widgetUnits: string; + private volumeUnits: string; private capacityUnits = Object.values(CapacityUnits); @@ -128,7 +129,7 @@ export class LiquidLevelWidgetComponent implements OnInit { this.getData().subscribe(data => { if (data) { - const { svg, volume, units } = data; + const { svg, volume, units, volumeUnits } = data; if (svg && isNotEmptyStr(svg) && this.liquidLevelContent.nativeElement) { const jQueryContainerElement = $(this.liquidLevelContent.nativeElement); jQueryContainerElement.html(svg); @@ -145,6 +146,10 @@ export class LiquidLevelWidgetComponent implements OnInit { this.volume = Number(volume); } + if (volumeUnits) { + this.volumeUnits = volumeUnits; + } + if (units) { this.widgetUnits = units; } @@ -164,7 +169,7 @@ export class LiquidLevelWidgetComponent implements OnInit { this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat); } - private getData(): Observable<{ svg: string; volume: number; units: string }> { + private getData(): Observable<{ svg: string; volume: number; units: string; volumeUnits: string}> { if (this.ctx.datasources?.length) { const entityId: EntityId = { entityType: this.ctx.datasources[0].entityType, @@ -308,7 +313,7 @@ export class LiquidLevelWidgetComponent implements OnInit { .pipe(map(attributes => { const shape = extractValue(attributes, this.settings.shapeAttributeName); if (!shape || !svgMapping.has(shape)) { - this.createdErrorMgs(this.settings.shapeAttributeName, isUndefinedOrNull(shape) || isEmptyStr(shape)); + this.createdErrorMsg(this.settings.shapeAttributeName, isUndefinedOrNull(shape) || isEmptyStr(shape)); return this.settings.selectedShape; } return shape; @@ -318,12 +323,15 @@ export class LiquidLevelWidgetComponent implements OnInit { return of(this.settings.selectedShape); } - private getTankersParams(entityId: EntityId): Observable<{ volume: number; units: string }> { + private getTankersParams(entityId: EntityId): Observable<{ volume: number; units: string; volumeUnits: string }> { const isVolumeStatic = this.settings.layout !== LevelCardLayout.absolute && this.settings.datasourceUnits === CapacityUnits.percent || this.settings.volumeSource === LiquidWidgetDataSourceType.static; const isUnitStatic = this.settings.layout !== LevelCardLayout.absolute || this.settings.widgetUnitsSource === LiquidWidgetDataSourceType.static; + const isVolumeUnitStatic = this.settings.layout !== LevelCardLayout.absolute + && this.settings.datasourceUnits === CapacityUnits.percent + || this.settings.volumeUnitsSource === LiquidWidgetDataSourceType.static; const attributeKeys: string[] = []; @@ -335,20 +343,29 @@ export class LiquidLevelWidgetComponent implements OnInit { attributeKeys.push(this.settings.widgetUnitsAttributeName); } + if (!isVolumeUnitStatic) { + attributeKeys.push(this.settings.volumeUnitsAttributeName); + } + if (!attributeKeys.length || entityId.id === NULL_UUID) { return of({ volume: this.settings.volumeConstant, + volumeUnits: this.settings.volumeUnits, units: this.settings.units }); } return this.ctx.attributeService.getEntityAttributes(entityId, null, attributeKeys).pipe( map(attributes => { - let volume = isVolumeStatic ? this.settings.volumeConstant : extractValue(attributes, this.settings.volumeAttributeName); - let units = isUnitStatic ? this.settings.units : extractValue(attributes, this.settings.widgetUnitsAttributeName); + let volume = isVolumeStatic ? this.settings.volumeConstant : + extractValue(attributes, this.settings.volumeAttributeName); + let volumeUnits = isVolumeUnitStatic ? this.settings.volumeUnits : + extractValue(attributes, this.settings.volumeUnitsAttributeName); + let units = isUnitStatic ? this.settings.units : + extractValue(attributes, this.settings.widgetUnitsAttributeName); if (!isVolumeStatic && (!volume || !isNumeric(volume) || volume < 0.1)) { - this.createdErrorMgs(this.settings.volumeAttributeName, isUndefinedOrNull(volume) || isEmptyStr(volume)); + this.createdErrorMsg(this.settings.volumeAttributeName, isUndefinedOrNull(volume) || isEmptyStr(volume)); volume = this.settings.volumeConstant; } @@ -358,20 +375,33 @@ export class LiquidLevelWidgetComponent implements OnInit { units = this.capacityUnits.find(unit => unit.normalize() === normalizeUnits); } if (isUndefinedOrNull(units) || !isNotEmptyStr(units)) { - this.createdErrorMgs(this.settings.widgetUnitsAttributeName, isUndefinedOrNull(units) || isEmptyStr(units)); + this.createdErrorMsg(this.settings.widgetUnitsAttributeName, isUndefinedOrNull(units) || isEmptyStr(units)); units = this.settings.units; } } + if (!isVolumeUnitStatic) { + if (isNotEmptyStr(volumeUnits)) { + const normalizeUnits = volumeUnits.normalize().trim(); + volumeUnits = this.capacityUnits.find(unit => unit.normalize() === normalizeUnits); + } + if (isUndefinedOrNull(volumeUnits) || !isNotEmptyStr(volumeUnits)) { + this.createdErrorMsg(this.settings.widgetUnitsAttributeName, + isUndefinedOrNull(volumeUnits) || isEmptyStr(volumeUnits)); + volumeUnits = this.settings.volumeUnits; + } + } + return { volume, + volumeUnits, units }; }) ); } - private createdErrorMgs(attributeName: string, isEmpty = false) { + private createdErrorMsg(attributeName: string, isEmpty = false) { if (isEmpty) { this.errorsMsg.push(this.translate.instant('widgets.liquid-level-card.attribute-key-not-set', {attributeName})); } else { @@ -474,9 +504,14 @@ export class LiquidLevelWidgetComponent implements OnInit { } if (this.settings.layout === LevelCardLayout.absolute) { - const volumeInLiters: number = convertLiters(this.volume, this.settings.volumeUnits as CapacityUnits, ConversionType.to); - const volume = convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from) - .toFixed(this.settings.decimals || 0); + let volume: number | string; + if (this.widgetUnits !== CapacityUnits.percent) { + const volumeInLiters: number = convertLiters(this.volume, this.volumeUnits as CapacityUnits, ConversionType.to); + volume = convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from) + .toFixed(this.settings.decimals || 0); + } else { + volume = this.volume.toFixed(this.settings.decimals || 0); + } const volumeTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.volumeFont), color: this.settings.volumeColor}); @@ -553,7 +588,7 @@ export class LiquidLevelWidgetComponent implements OnInit { private convertInputData(value: any): number { if (this.settings.datasourceUnits !== CapacityUnits.percent) { return (convertLiters(Number(value), this.settings.datasourceUnits, ConversionType.to) / - convertLiters(this.volume, this.settings.volumeUnits, ConversionType.to)) * 100; + convertLiters(this.volume, this.volumeUnits as CapacityUnits, ConversionType.to)) * 100; } return Number(value); @@ -561,7 +596,7 @@ export class LiquidLevelWidgetComponent implements OnInit { private convertOutputData(value: number): number { if (this.widgetUnits !== CapacityUnits.percent) { - return convertLiters(this.volume * (value / 100), this.settings.volumeUnits, ConversionType.to); + return convertLiters(this.volume * (value / 100), this.volumeUnits as CapacityUnits, ConversionType.to); } return value; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.models.ts index 954e228e79..632cfe570d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.models.ts @@ -56,6 +56,8 @@ export interface LevelCardWidgetSettings extends WidgetConfig { volumeSource: LiquidWidgetDataSourceType; volumeConstant: number; volumeAttributeName: string; + volumeUnitsSource: LiquidWidgetDataSourceType; + volumeUnitsAttributeName: string; volumeUnits: CapacityUnits; volumeFont: Font; volumeColor: string; @@ -257,8 +259,10 @@ export const levelCardDefaultSettings: LevelCardWidgetSettings = { iconColor: '#5469FF', volumeSource: LiquidWidgetDataSourceType.static, volumeConstant: 500, - volumeUnits: CapacityUnits.liters, volumeAttributeName: 'volume', + volumeUnitsSource: LiquidWidgetDataSourceType.static, + volumeUnitsAttributeName: 'volumeUnits', + volumeUnits: CapacityUnits.liters, volumeFont: { family: 'Roboto', size: 14, @@ -375,9 +379,7 @@ export const convertLiters = (value: number, units: CapacityUnits, conversionTyp return conversionType === ConversionType.to ? value / factor : value * factor; }; -export const extractValue = (attributes: Array, attributeName: string): T | undefined => { - return attributes.find(attr => attr.key === attributeName)?.value; -}; +export const extractValue = (attributes: Array, attributeName: string): T | undefined => attributes.find(attr => attr.key === attributeName)?.value; export const valueContainerStyleDefaults = cssTextFromInlineStyle({ width: '100%', @@ -494,6 +496,7 @@ export const updatedFormSettingsValidators = (formGroup: FormGroup) => { const datasourceUnits: string = formGroup.get('datasourceUnits').value; const layout: LevelCardLayout = formGroup.get('layout').value; const volumeSource: LiquidWidgetDataSourceType = formGroup.get('volumeSource').value; + const volumeUnitsSource: LiquidWidgetDataSourceType = formGroup.get('volumeUnitsSource').value; const widgetUnitsSource: LiquidWidgetDataSourceType = formGroup.get('widgetUnitsSource').value; const showTooltipLevel: boolean = formGroup.get('showTooltipLevel').value; const showTooltipDate: boolean = formGroup.get('showTooltipDate').value; @@ -517,7 +520,7 @@ export const updatedFormSettingsValidators = (formGroup: FormGroup) => { if (datasourceUnits !== CapacityUnits.percent) { formGroup.get('volumeSource').enable({emitEvent: false}); - formGroup.get('volumeUnits').enable({emitEvent: false}); + formGroup.get('volumeUnitsSource').enable({emitEvent: false}); if (volumeSource === LiquidWidgetDataSourceType.static) { formGroup.get('volumeConstant').enable({emitEvent: false}); formGroup.get('volumeAttributeName').disable({emitEvent: false}); @@ -525,11 +528,20 @@ export const updatedFormSettingsValidators = (formGroup: FormGroup) => { formGroup.get('volumeConstant').disable({emitEvent: false}); formGroup.get('volumeAttributeName').enable({emitEvent: false}); } + if (volumeUnitsSource === LiquidWidgetDataSourceType.static) { + formGroup.get('volumeUnits').enable({emitEvent: false}); + formGroup.get('volumeUnitsAttributeName').disable({emitEvent: false}); + } else { + formGroup.get('volumeUnits').disable({emitEvent: false}); + formGroup.get('volumeUnitsAttributeName').enable({emitEvent: false}); + } } else { formGroup.get('volumeSource').disable({emitEvent: false}); formGroup.get('volumeConstant').disable({emitEvent: false}); formGroup.get('volumeAttributeName').disable({emitEvent: false}); + formGroup.get('volumeUnitsSource').disable({emitEvent: false}); formGroup.get('volumeUnits').disable({emitEvent: false}); + formGroup.get('volumeUnitsAttributeName').disable({emitEvent: false}); } if (layout === LevelCardLayout.simple) { @@ -557,7 +569,7 @@ export const updatedFormSettingsValidators = (formGroup: FormGroup) => { } formGroup.get('volumeSource').enable({emitEvent: false}); - formGroup.get('volumeUnits').enable({emitEvent: false}); + formGroup.get('volumeUnitsSource').enable({emitEvent: false}); if (volumeSource === LiquidWidgetDataSourceType.static) { formGroup.get('volumeConstant').enable({emitEvent: false}); formGroup.get('volumeAttributeName').disable({emitEvent: false}); @@ -565,6 +577,13 @@ export const updatedFormSettingsValidators = (formGroup: FormGroup) => { formGroup.get('volumeConstant').disable({emitEvent: false}); formGroup.get('volumeAttributeName').enable({emitEvent: false}); } + if (volumeUnitsSource === LiquidWidgetDataSourceType.static) { + formGroup.get('volumeUnits').enable({emitEvent: false}); + formGroup.get('volumeUnitsAttributeName').disable({emitEvent: false}); + } else { + formGroup.get('volumeUnits').disable({emitEvent: false}); + formGroup.get('volumeUnitsAttributeName').enable({emitEvent: false}); + } if (formGroup.get('decimals')) { formGroup.get('decimals').enable({emitEvent: false}); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts index 8b20b8d93f..5540c1351a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts @@ -32,7 +32,7 @@ import { WidgetUnitedMapSettings } from './map-models'; import { Marker } from './markers'; -import { map, Observable, of, switchMap } from 'rxjs'; +import { map, Observable, of } from 'rxjs'; import { Polyline } from './polyline'; import { Polygon } from './polygon'; import { Circle } from './circle'; @@ -64,6 +64,7 @@ import { MatDialog } from '@angular/material/dialog'; import { FormattedData, ReplaceInfo } from '@shared/models/widget.models'; import ITooltipsterInstance = JQueryTooltipster.ITooltipsterInstance; import { ImagePipe } from '@shared/pipe/image.pipe'; +import { take, tap } from 'rxjs/operators'; export default abstract class LeafletMap { @@ -940,7 +941,12 @@ export default abstract class LeafletMap { this.markersData = markersData; if (this.options.useClusterMarkers) { if (createdMarkers.length) { - this.markersCluster.addLayers(createdMarkers.map(marker => marker.leafletMarker)); + createdMarkers.forEach((marker) => { + marker.createMarkerIconSubject.pipe( + tap(() => this.markersCluster.addLayer(marker.leafletMarker)), + take(1) + ).subscribe(); + }); } if (updatedMarkers.length) { this.markersCluster.refreshClusters(updatedMarkers.map(marker => marker.leafletMarker)); @@ -971,10 +977,15 @@ export default abstract class LeafletMap { } this.markers.set(key, newMarker); if (!this.options.useClusterMarkers) { - this.map.addLayer(newMarker.leafletMarker); - if (this.map.pm.globalDragModeEnabled() && newMarker.leafletMarker.pm) { - newMarker.leafletMarker.pm.enableLayerDrag(); - } + newMarker.createMarkerIconSubject.pipe( + tap(() => { + this.map.addLayer(newMarker.leafletMarker); + if (this.map.pm.globalDragModeEnabled() && newMarker.leafletMarker.pm) { + newMarker.leafletMarker.pm.enableLayerDrag(); + } + }), + take(1) + ).subscribe(); } return newMarker; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts index 23913f75da..582faf6ebd 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts @@ -23,6 +23,7 @@ import { fillDataPattern, isDefined, isDefinedAndNotNull, processDataPattern, sa import LeafletMap from './leaflet-map'; import { FormattedData } from '@shared/models/widget.models'; import { ImagePipe } from '@shared/pipe/image.pipe'; +import { ReplaySubject } from 'rxjs'; export class Marker { @@ -33,6 +34,7 @@ export class Marker { tooltipOffset: L.LatLngTuple; markerOffset: L.LatLngTuple; tooltip: L.Popup; + createMarkerIconSubject = new ReplaySubject(); constructor(private map: LeafletMap, private location: L.LatLng, @@ -148,6 +150,7 @@ export class Marker { this.labelOffset = [0, -iconInfo.size[1] * this.markerOffset[1] + 10]; } this.updateMarkerLabel(settings); + this.createMarkerIconSubject.next(iconInfo); }); } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html new file mode 100644 index 0000000000..48e4106a97 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html @@ -0,0 +1,26 @@ + +
+
+ +
+
+
+
+ +
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.scss new file mode 100644 index 0000000000..d65341a7ba --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.scss @@ -0,0 +1,64 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.tb-power-button-panel { + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + gap: 16px; + padding: 20px 24px 24px 24px; + > div:not(.tb-power-button-overlay) { + z-index: 1; + } + .tb-power-button-overlay { + position: absolute; + top: 12px; + left: 12px; + bottom: 12px; + right: 12px; + } + div.tb-widget-title { + padding: 0; + } + .tb-power-button-content { + flex: 1; + min-width: 0; + min-height: 0; + .tb-power-button-shape { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + svg { + .tb-small-shadow { + filter: drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.2)); + } + .tb-shadow { + filter: drop-shadow(0px 0px 10px rgba(0, 0, 0, 0.15)); + } + } + &.tb-power-button-pointer { + svg { + .tb-hover-circle { + cursor: pointer; + } + } + } + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts new file mode 100644 index 0000000000..02c58b3e9a --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.ts @@ -0,0 +1,203 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + AfterViewInit, + ChangeDetectorRef, + Component, + ElementRef, + OnDestroy, + OnInit, + Renderer2, + ViewChild, + ViewEncapsulation +} from '@angular/core'; +import { BasicActionWidgetComponent, ValueSetter } from '@home/components/widget/lib/action/action-widget.models'; +import { backgroundStyle, ComponentStyle, overlayStyle } from '@shared/models/widget-settings.models'; +import { Observable } from 'rxjs'; +import { ResizeObserver } from '@juggle/resize-observer'; +import { ImagePipe } from '@shared/pipe/image.pipe'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ValueType } from '@shared/models/constants'; +import { + powerButtonDefaultSettings, + PowerButtonShape, + powerButtonShapeSize, + PowerButtonWidgetSettings +} from '@home/components/widget/lib/rpc/power-button-widget.models'; +import { SVG, Svg } from '@svgdotjs/svg.js'; + +@Component({ + selector: 'tb-power-button-widget', + templateUrl: './power-button-widget.component.html', + styleUrls: ['../action/action-widget.scss', './power-button-widget.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class PowerButtonWidgetComponent extends + BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy { + + @ViewChild('powerButtonShape', {static: false}) + powerButtonShape: ElementRef; + + settings: PowerButtonWidgetSettings; + + backgroundStyle$: Observable; + overlayStyle: ComponentStyle = {}; + + value = false; + disabled = false; + + private shapeResize$: ResizeObserver; + private drawSvgShapePending = false; + private svgShape: Svg; + private powerButtonSvgShape: PowerButtonShape; + private disabledState = false; + + private onValueSetter: ValueSetter; + private offValueSetter: ValueSetter; + + constructor(protected imagePipe: ImagePipe, + protected sanitizer: DomSanitizer, + private renderer: Renderer2, + protected cd: ChangeDetectorRef) { + super(cd); + } + + ngOnInit(): void { + super.ngOnInit(); + this.settings = {...powerButtonDefaultSettings, ...this.ctx.settings}; + + this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer); + this.overlayStyle = overlayStyle(this.settings.background.overlay); + + const getInitialStateSettings = + {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.initial-state')}; + this.createValueGetter(getInitialStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onValue(value) + }); + + const disabledStateSettings = + {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.disabled-state')}; + this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onDisabled(value) + }); + + const onUpdateStateSettings = {...this.settings.onUpdateState, + actionLabel: this.ctx.translate.instant('widgets.power-button.power-on')}; + this.onValueSetter = this.createValueSetter(onUpdateStateSettings); + + const offUpdateStateSettings = {...this.settings.offUpdateState, + actionLabel: this.ctx.translate.instant('widgets.power-button.power-off')}; + this.offValueSetter = this.createValueSetter(offUpdateStateSettings); + + this.loading$.subscribe((loading) => { + this.updateDisabledState(loading || this.disabled); + this.cd.markForCheck(); + }); + } + + ngAfterViewInit(): void { + if (this.drawSvgShapePending) { + this.drawSvg(); + } + super.ngAfterViewInit(); + } + + ngOnDestroy() { + if (this.shapeResize$) { + this.shapeResize$.disconnect(); + } + super.ngOnDestroy(); + } + + public onInit() { + super.onInit(); + const borderRadius = this.ctx.$widgetElement.css('borderRadius'); + this.overlayStyle = {...this.overlayStyle, ...{borderRadius}}; + if (this.powerButtonShape) { + this.drawSvg(); + } else { + this.drawSvgShapePending = true; + } + this.cd.detectChanges(); + } + + private onValue(value: boolean): void { + const newValue = !!value; + if (this.value !== newValue) { + this.value = newValue; + this.powerButtonSvgShape?.setValue(this.value); + this.cd.markForCheck(); + } + } + + private onDisabled(value: boolean): void { + const newDisabled = !!value; + if (this.disabled !== newDisabled) { + this.disabled = newDisabled; + this.updateDisabledState(this.disabled); + this.cd.markForCheck(); + } + } + + private onClick() { + if (!this.ctx.isEdit && !this.ctx.isPreview && !this.disabledState) { + this.onValue(!this.value); + const targetValue = this.value; + const targetSetter = targetValue ? this.onValueSetter : this.offValueSetter; + this.powerButtonSvgShape?.setPressed(true); + this.updateValue(targetSetter, targetValue, { + next: () => { + this.powerButtonSvgShape?.setPressed(false); + this.onValue(targetValue); + }, + error: () => { + this.powerButtonSvgShape?.setPressed(false); + this.onValue(!targetValue); + } + }); + } + } + + private drawSvg() { + this.svgShape = SVG().addTo(this.powerButtonShape.nativeElement).size(powerButtonShapeSize, powerButtonShapeSize); + this.renderer.setStyle(this.svgShape.node, 'overflow', 'visible'); + this.renderer.setStyle(this.svgShape.node, 'user-select', 'none'); + + this.powerButtonSvgShape = PowerButtonShape.fromSettings(this.ctx, this.svgShape, + this.settings, this.value, this.disabledState, () => this.onClick()); + + this.shapeResize$ = new ResizeObserver(() => { + this.onResize(); + }); + this.shapeResize$.observe(this.powerButtonShape.nativeElement); + this.onResize(); + } + + private updateDisabledState(disabled: boolean) { + this.disabledState = disabled; + this.powerButtonSvgShape?.setDisabled(this.disabledState); + } + + private onResize() { + const shapeWidth = this.powerButtonShape.nativeElement.getBoundingClientRect().width; + const shapeHeight = this.powerButtonShape.nativeElement.getBoundingClientRect().height; + const size = Math.min(shapeWidth, shapeHeight); + const scale = size / powerButtonShapeSize; + this.renderer.setStyle(this.svgShape.node, 'transform', `scale(${scale})`); + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts new file mode 100644 index 0000000000..2e8ca0de6d --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts @@ -0,0 +1,953 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { BackgroundSettings, BackgroundType } from '@shared/models/widget-settings.models'; +import { AttributeScope } from '@shared/models/telemetry/telemetry.models'; +import { + DataToValueType, + GetValueAction, + GetValueSettings, + SetValueAction, + SetValueSettings, + ValueToDataType +} from '@shared/models/action-widget-settings.models'; +import { Circle, Effect, Element, G, Gradient, Runner, Svg, Text, Timeline } from '@svgdotjs/svg.js'; +import '@svgdotjs/svg.filter.js'; +import tinycolor from 'tinycolor2'; +import { WidgetContext } from '@home/models/widget-component.models'; + +export enum PowerButtonLayout { + default = 'default', + simplified = 'simplified', + outlined = 'outlined', + default_volume = 'default_volume', + simplified_volume = 'simplified_volume', + outlined_volume = 'outlined_volume' +} + +export const powerButtonLayouts = Object.keys(PowerButtonLayout) as PowerButtonLayout[]; + +export const powerButtonLayoutTranslations = new Map( + [ + [PowerButtonLayout.default, 'widgets.power-button.layout-default'], + [PowerButtonLayout.simplified, 'widgets.power-button.layout-simplified'], + [PowerButtonLayout.outlined, 'widgets.power-button.layout-outlined'], + [PowerButtonLayout.default_volume, 'widgets.power-button.layout-default-volume'], + [PowerButtonLayout.simplified_volume, 'widgets.power-button.layout-simplified-volume'], + [PowerButtonLayout.outlined_volume, 'widgets.power-button.layout-outlined-volume'] + ] +); + +export const powerButtonLayoutImages = new Map( + [ + [PowerButtonLayout.default, 'assets/widget/power-button/default-layout.svg'], + [PowerButtonLayout.simplified, 'assets/widget/power-button/simplified-layout.svg'], + [PowerButtonLayout.outlined, 'assets/widget/power-button/outlined-layout.svg'], + [PowerButtonLayout.default_volume, 'assets/widget/power-button/default-volume-layout.svg'], + [PowerButtonLayout.simplified_volume, 'assets/widget/power-button/simplified-volume-layout.svg'], + [PowerButtonLayout.outlined_volume, 'assets/widget/power-button/outlined-volume-layout.svg'] + ] +); + +export interface PowerButtonWidgetSettings { + initialState: GetValueSettings; + disabledState: GetValueSettings; + onUpdateState: SetValueSettings; + offUpdateState: SetValueSettings; + layout: PowerButtonLayout; + mainColorOn: string; + backgroundColorOn: string; + mainColorOff: string; + backgroundColorOff: string; + mainColorDisabled: string; + backgroundColorDisabled: string; + background: BackgroundSettings; +} + +export const powerButtonDefaultSettings: PowerButtonWidgetSettings = { + initialState: { + action: GetValueAction.EXECUTE_RPC, + defaultValue: false, + executeRpc: { + method: 'getState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + disabledState: { + action: GetValueAction.DO_NOTHING, + defaultValue: false, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + onUpdateState: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.CONSTANT, + constantValue: true, + valueToDataFunction: '/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;' + } + }, + offUpdateState: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.CONSTANT, + constantValue: false, + valueToDataFunction: '/* Convert input boolean value to RPC parameters or attribute/time-series value */ \n return value;' + } + }, + layout: PowerButtonLayout.default, + mainColorOn: '#3F52DD', + backgroundColorOn: '#FFFFFF', + mainColorOff: '#A2A2A2', + backgroundColorOff: '#FFFFFF', + mainColorDisabled: 'rgba(0,0,0,0.12)', + backgroundColorDisabled: '#FFFFFF', + background: { + type: BackgroundType.color, + color: '#fff', + overlay: { + enabled: false, + color: 'rgba(255,255,255,0.72)', + blur: 3 + } + } +}; + +interface PowerButtonColor { + hex: string; + opacity: number; +} + +type PowerButtonState = 'on' | 'off' | 'disabled'; + +interface PowerButtonColorState { + mainColor: PowerButtonColor; + backgroundColor: PowerButtonColor; +} + +type PowerButtonShapeColors = Record; + +const createPowerButtonShapeColors = (settings: PowerButtonWidgetSettings): PowerButtonShapeColors => { + const mainColorOn = tinycolor(settings.mainColorOn); + const backgroundColorOn = tinycolor(settings.backgroundColorOn); + const mainColorOff = tinycolor(settings.mainColorOff); + const backgroundColorOff = tinycolor(settings.backgroundColorOff); + const mainColorDisabled = tinycolor(settings.mainColorDisabled); + const backgroundColorDisabled = tinycolor(settings.backgroundColorDisabled); + return { + on: { + mainColor: {hex: mainColorOn.toHexString(), opacity: mainColorOn.getAlpha()}, + backgroundColor: {hex: backgroundColorOn.toHexString(), opacity: backgroundColorOn.getAlpha()}, + }, + off: { + mainColor: {hex: mainColorOff.toHexString(), opacity: mainColorOff.getAlpha()}, + backgroundColor: {hex: backgroundColorOff.toHexString(), opacity: backgroundColorOff.getAlpha()}, + }, + disabled: { + mainColor: {hex: mainColorDisabled.toHexString(), opacity: mainColorDisabled.getAlpha()}, + backgroundColor: {hex: backgroundColorDisabled.toHexString(), opacity: backgroundColorDisabled.getAlpha()}, + } + }; +}; + +export const powerButtonShapeSize = 110; +const cx = powerButtonShapeSize / 2; +const cy = powerButtonShapeSize / 2; + +const powerButtonAnimation = (element: Element): Runner => element.animate(200, 0, 'now'); + +export abstract class PowerButtonShape { + + static fromSettings(ctx: WidgetContext, + svgShape: Svg, + settings: PowerButtonWidgetSettings, + value: boolean, + disabled: boolean, + onClick: () => void): PowerButtonShape { + switch (settings.layout) { + case PowerButtonLayout.default: + return new DefaultPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + case PowerButtonLayout.simplified: + return new SimplifiedPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + case PowerButtonLayout.outlined: + return new OutlinedPowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + case PowerButtonLayout.default_volume: + return new DefaultVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + case PowerButtonLayout.simplified_volume: + return new SimplifiedVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + case PowerButtonLayout.outlined_volume: + return new OutlinedVolumePowerButtonShape(ctx, svgShape, settings, value, disabled, onClick); + } + } + + protected readonly colors: PowerButtonShapeColors; + protected readonly onLabel: string; + protected readonly offLabel: string; + + protected backgroundShape: Circle; + protected hoverShape: Circle; + protected hovered = false; + protected pressed = false; + protected forcePressed = false; + + protected constructor(protected widgetContext: WidgetContext, + protected svgShape: Svg, + protected settings: PowerButtonWidgetSettings, + protected value: boolean, + protected disabled: boolean, + protected onClick: () => void) { + this.colors = createPowerButtonShapeColors(this.settings); + this.onLabel = this.widgetContext.translate.instant('widgets.power-button.on-label').toUpperCase(); + this.offLabel = this.widgetContext.translate.instant('widgets.power-button.off-label').toUpperCase(); + this._drawShape(); + } + + public setValue(value: boolean) { + if (this.value !== value) { + this.value = value; + this._drawState(); + } + } + + public setDisabled(disabled: boolean) { + if (this.disabled !== disabled) { + this.disabled = disabled; + this._drawState(); + } + } + + public setPressed(pressed: boolean) { + if (this.forcePressed !== pressed) { + this.forcePressed = pressed; + if (this.forcePressed && !this.pressed) { + this.onPressStart(); + } else if (!this.forcePressed && !this.pressed) { + this.onPressEnd(); + } + } + } + + private _drawShape() { + + this.backgroundShape = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + + this.drawShape(); + + this.hoverShape = this.svgShape.circle(powerButtonShapeSize).center(cx, cy).addClass('tb-hover-circle') + .fill({color: '#000000', opacity: 0}); + this.hoverShape.on('mouseover', () => { + this.hovered = true; + if (!this.disabled) { + this.hoverShape.timeline().finish(); + this.hoverShape.animate(200).attr({'fill-opacity': 0.06}); + } + }); + this.hoverShape.on('mouseout', () => { + this.hovered = false; + this.hoverShape.timeline().finish(); + this.hoverShape.animate(200).attr({'fill-opacity': 0}); + this._cancelPressed(); + }); + this.hoverShape.on('touchmove', (event: TouchEvent) => { + const touch = event.touches[0]; + const element = document.elementFromPoint(touch.pageX,touch.pageY); + if (this.hoverShape.node !== element) { + this._cancelPressed(); + } + }); + this.hoverShape.on('touchcancel', () => { + this._cancelPressed(); + }); + this.hoverShape.on('mousedown touchstart', (event: Event) => { + if (event.type === 'mousedown') { + if ((event as MouseEvent).button !== 0) { + return; + } + } + if (!this.disabled && !this.pressed) { + this.pressed = true; + if (!this.forcePressed) { + this.onPressStart(); + } + } + }); + this.hoverShape.on('mouseup touchend touchcancel', () => { + if (this.pressed && !this.disabled) { + this.onClick(); + } + this._cancelPressed(); + }); + this._drawState(); + } + + private _cancelPressed() { + if (this.pressed) { + this.pressed = false; + if (!this.forcePressed) { + this.onPressEnd(); + } + } + } + + private _drawState() { + let colorState: PowerButtonColorState; + if (this.disabled) { + colorState = this.colors.disabled; + } else { + colorState = this.value ? this.colors.on : this.colors.off; + } + this.drawBackgroundState(colorState.backgroundColor); + this.drawColorState(colorState.mainColor); + if (this.value) { + this.drawOn(); + } else { + this.drawOff(); + } + if (this.disabled) { + this.hoverShape.timeline().finish(); + this.hoverShape.attr({'fill-opacity': 0}); + } else if (this.hovered) { + this.hoverShape.timeline().finish(); + this.hoverShape.animate(200).attr({'fill-opacity': 0.06}); + } + } + + private drawBackgroundState(backgroundColor: PowerButtonColor) { + this.backgroundShape.attr({ fill: backgroundColor.hex, 'fill-opacity': backgroundColor.opacity}); + } + + protected drawShape() {} + + protected drawColorState(_mainColor: PowerButtonColor) {} + + protected drawOff() {} + + protected drawOn() {} + + protected onPressStart() {} + + protected onPressEnd() {} + + protected createMask(shape: Element, maskElements: Element[]) { + const mask = + this.svgShape.mask().add(this.svgShape.rect().width('100%').height('100%').fill('#fff')); + maskElements.forEach(e => { + mask.add(e.fill('#000').attr({'fill-opacity': 1})); + }); + shape.maskWith(mask); + } + + protected createOnLabel(fontWeight = '500'): Text { + return this.createLabel(this.onLabel, fontWeight); + } + + protected createOffLabel(fontWeight = '500'): Text { + return this.createLabel(this.offLabel, fontWeight); + } + + private createLabel(text: string, fontWeight = '500'): Text { + return this.svgShape.text(text).font({ + family: 'Roboto', + weight: fontWeight, + style: 'normal', + size: '22px' + }).attr({x: '50%', y: '50%', 'text-anchor': 'middle', 'dominant-baseline': 'middle'}); + } + +} + +class InnerShadowCircle { + + private shadowCircle: Circle; + private blurEffect: Effect; + private offsetEffect: Effect; + private floodEffect: Effect; + + constructor(private svgShape: Svg, + private diameter: number, + private centerX: number, + private centerY: number, + private blur = 6, + private shadowOpacity = 0.6, + private dx = 0, + private dy = 0, + private shadowColor = '#000') { + + this.shadowCircle = this.svgShape.circle(this.diameter).center(this.centerX, this.centerY) + .fill({color: '#fff', opacity: 1}).stroke({width: 0}); + + this.shadowCircle.filterWith(add => { + add.x('-50%').y('-50%').width('200%').height('200%'); + let effect: Effect = add.componentTransfer(components => { + components.funcA({ type: 'table', tableValues: '1 0' }); + }).in(add.$fill); + effect = effect.gaussianBlur(this.blur, this.blur).attr({stdDeviation: this.blur}); + this.blurEffect = effect; + effect = effect.offset(this.dx, this.dy); + this.offsetEffect = effect; + effect = effect.flood(this.shadowColor, this.shadowOpacity); + this.floodEffect = effect; + effect = effect.composite(this.offsetEffect, 'in'); + effect.composite(add.$sourceAlpha, 'in'); + add.merge(m => { + m.mergeNode(add.$fill); + m.mergeNode(); + }); + }); + } + + public timeline(tl: Timeline): void { + this.blurEffect.timeline(tl); + this.offsetEffect.timeline(tl); + this.floodEffect.timeline(tl); + } + + public animate(blur: number, opacity: number, dx = 0, dy = 0): Runner { + powerButtonAnimation(this.blurEffect).attr({stdDeviation: blur}); + powerButtonAnimation(this.offsetEffect).attr({dx, dy}); + return powerButtonAnimation(this.floodEffect).attr({'flood-opacity': opacity}); + } + + public animateRestore(): Runner { + return this.animate(this.blur, this.shadowOpacity, this.dx, this.dy); + } + + public show(): void { + this.shadowCircle.show(); + } + + public hide(): void { + this.shadowCircle.hide(); + } + +} + +class DefaultPowerButtonShape extends PowerButtonShape { + + private outerBorder: Circle; + private outerBorderMask: Circle; + private offLabelShape: Text; + private onCircleShape: Circle; + private onLabelShape: Text; + private pressedShadow: InnerShadowCircle; + private pressedTimeline: Timeline; + private centerGroup: G; + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel().addTo(this.centerGroup); + this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 20) + .center(cx, cy); + this.onLabelShape = this.createOnLabel(); + this.createMask(this.onCircleShape, [this.onLabelShape]); + this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 20, cx, cy, 0, 0); + + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onLabelShape.timeline(this.pressedTimeline); + this.pressedShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor) { + this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + this.outerBorderMask.radius((powerButtonShapeSize - 20)/2); + this.onCircleShape.hide(); + this.centerGroup.show(); + } + + protected drawOn() { + this.outerBorderMask.radius((powerButtonShapeSize - 2)/2); + this.centerGroup.hide(); + this.onCircleShape.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + const pressedScale = 0.75; + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale}); + this.pressedShadow.animate(6, 0.6); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onLabelShape).transform({scale: 1}); + this.pressedShadow.animateRestore(); + } + +} + +class SimplifiedPowerButtonShape extends PowerButtonShape { + + private outerBorder: Circle; + private outerBorderMask: Circle; + private onCircleShape: Circle; + private offLabelShape: Text; + private onLabelShape: Text; + private pressedShadow: InnerShadowCircle; + private pressedTimeline: Timeline; + private centerGroup: G; + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 4).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel().addTo(this.centerGroup); + this.onCircleShape = this.svgShape.circle(powerButtonShapeSize).center(cx, cy); + this.onLabelShape = this.createOnLabel(); + this.createMask(this.onCircleShape, [this.onLabelShape]); + this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 4, cx, cy, 0, 0); + + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onLabelShape.timeline(this.pressedTimeline); + this.pressedShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor) { + this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + this.onCircleShape.hide(); + this.outerBorder.show(); + this.centerGroup.show(); + } + + protected drawOn() { + this.centerGroup.hide(); + this.outerBorder.hide(); + this.onCircleShape.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + const pressedScale = 0.75; + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale}); + this.pressedShadow.animate(6, 0.6); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onLabelShape).transform({scale: 1}); + this.pressedShadow.animateRestore(); + } +} + +class OutlinedPowerButtonShape extends PowerButtonShape { + private outerBorder: Circle; + private outerBorderMask: Circle; + private innerBorder: Circle; + private innerBorderMask: Circle; + private offLabelShape: Text; + private onCircleShape: Circle; + private onLabelShape: Text; + private pressedShadow: InnerShadowCircle; + private pressedTimeline: Timeline; + private centerGroup: G; + private onCenterGroup: G; + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 2).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.innerBorder = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.innerBorderMask = this.svgShape.circle(powerButtonShapeSize - 24).center(cx, cy); + this.createMask(this.innerBorder, [this.innerBorderMask]); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel().addTo(this.centerGroup); + this.onCenterGroup = this.svgShape.group(); + this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 28).center(cx, cy) + .addTo(this.onCenterGroup); + this.onLabelShape = this.createOnLabel(); + this.createMask(this.onCircleShape, [this.onLabelShape]); + this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 24, cx, cy, 0, 0); + + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onCenterGroup.timeline(this.pressedTimeline); + this.onLabelShape.timeline(this.pressedTimeline); + this.pressedShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor) { + this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.innerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + this.onCenterGroup.hide(); + this.centerGroup.show(); + } + + protected drawOn() { + this.centerGroup.hide(); + this.onCenterGroup.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + const pressedScale = 0.75; + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98}); + powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98}); + this.pressedShadow.animate(6, 0.6); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onCenterGroup).transform({scale: 1}); + powerButtonAnimation(this.onLabelShape).transform({scale: 1}); + this.pressedShadow.animateRestore(); + } +} + +class DefaultVolumePowerButtonShape extends PowerButtonShape { + private outerBorder: Circle; + private outerBorderMask: Circle; + private outerBorderGradient: Gradient; + private innerBorder: Circle; + private innerBorderMask: Circle; + private innerBorderGradient: Gradient; + private innerShadow: InnerShadowCircle; + //private innerShadowGradient: Gradient; + //private innerShadowGradientStop: Stop; + private offLabelShape: Text; + private onCircleShape: Circle; + private onLabelShape: Text; + private pressedTimeline: Timeline; + private centerGroup: G; + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.outerBorderGradient = this.svgShape.gradient('linear', (add) => { + add.stop(0, '#CCCCCC', 1); + add.stop(1, '#FFFFFF', 1); + }).from(0.268, 0.92).to(0.832, 0.1188); + this.innerBorder = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.innerBorderMask = this.svgShape.circle(powerButtonShapeSize - 24).center(cx, cy); + this.createMask(this.innerBorder, [this.innerBorderMask]); + this.innerBorderGradient = this.svgShape.gradient('linear', (add) => { + add.stop(0, '#CCCCCC', 1); + add.stop(1, '#FFFFFF', 1); + }).from(0.832, 0.1188).to(0.268, 0.92); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel('400').addTo(this.centerGroup); + this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 24).center(cx, cy); + this.onLabelShape = this.createOnLabel('400'); + this.createMask(this.onCircleShape, [this.onLabelShape]); + this.innerShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 24, cx, cy, 3, 0.3); + + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onLabelShape.timeline(this.pressedTimeline); + this.innerShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor){ + if (this.disabled) { + this.backgroundShape.removeClass('tb-small-shadow'); + if (!this.forcePressed) { + this.innerShadow.hide(); + } + this.outerBorder.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.innerBorder.attr({fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } else { + this.backgroundShape.addClass('tb-small-shadow'); + this.innerShadow.show(); + this.outerBorder.fill(this.outerBorderGradient); + this.outerBorder.attr({ 'fill-opacity': 1 }); + this.innerBorder.fill(this.innerBorderGradient); + this.innerBorder.attr({ 'fill-opacity': 1 }); + } + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + this.onCircleShape.hide(); + this.centerGroup.show(); + this.innerBorder.show(); + } + + protected drawOn() { + if (this.disabled) { + this.innerBorder.hide(); + } else { + this.innerBorder.show(); + } + this.centerGroup.hide(); + this.onCircleShape.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + this.innerShadow.show(); + const pressedScale = 0.75; + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale}); + this.innerShadow.animate(6, 0.6); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onLabelShape).transform({scale: 1}); + this.innerShadow.animateRestore().after(() => { + if (this.disabled) { + this.innerShadow.hide(); + } + }); + } + +} + +class SimplifiedVolumePowerButtonShape extends PowerButtonShape { + + private outerBorder: Circle; + private outerBorderMask: Circle; + private offLabelShape: Text; + private onLabelShape: Text; + private innerShadow: InnerShadowCircle; + private pressedShadow: InnerShadowCircle; + private pressedTimeline: Timeline; + private centerGroup: G; + private onCenterGroup: G; + + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({color: '#FAFAFA', opacity: 1}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 4).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel().addTo(this.centerGroup); + this.onCenterGroup = this.svgShape.group(); + this.onLabelShape = this.createOnLabel().addTo(this.onCenterGroup); + this.innerShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 4, cx, cy, 3, 0.3); + this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 4, cx, cy, 0, 0); + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onCenterGroup.timeline(this.pressedTimeline); + this.pressedShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor){ + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + if (!this.pressed) { + this.backgroundShape.addClass('tb-shadow'); + } + this.innerShadow.hide(); + this.onCenterGroup.hide(); + this.centerGroup.show(); + } + + protected drawOn() { + this.backgroundShape.removeClass('tb-shadow'); + this.centerGroup.hide(); + this.onCenterGroup.show(); + this.innerShadow.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + const pressedScale = 0.75; + if (!this.value) { + this.backgroundShape.removeClass('tb-shadow'); + } + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onCenterGroup).transform({scale: pressedScale}); + this.pressedShadow.animate(8, 0.4); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onCenterGroup).transform({scale: 1}); + this.pressedShadow.animateRestore().after(() => { + if (!this.value) { + this.backgroundShape.addClass('tb-shadow'); + } + }); + } +} + +class OutlinedVolumePowerButtonShape extends PowerButtonShape { + private outerBorder: Circle; + private outerBorderMask: Circle; + private outerBorderGradient: Gradient; + private innerBorder: Circle; + private innerBorderMask: Circle; + private offLabelShape: Text; + private onCircleShape: Circle; + private onLabelShape: Text; + private pressedShadow: InnerShadowCircle; + private pressedTimeline: Timeline; + private centerGroup: G; + private onCenterGroup: G; + + protected drawShape() { + this.outerBorder = this.svgShape.circle(powerButtonShapeSize).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.outerBorderMask = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy); + this.createMask(this.outerBorder, [this.outerBorderMask]); + this.outerBorderGradient = this.svgShape.gradient('linear', (add) => { + add.stop(0, '#CCCCCC', 1); + add.stop(1, '#FFFFFF', 1); + }).from(0.268, 0.92).to(0.832, 0.1188); + this.innerBorder = this.svgShape.circle(powerButtonShapeSize - 20).center(cx, cy) + .fill({opacity: 0}).stroke({width: 0}); + this.innerBorderMask = this.svgShape.circle(powerButtonShapeSize - 30).center(cx, cy); + this.createMask(this.innerBorder, [this.innerBorderMask]); + this.centerGroup = this.svgShape.group(); + this.offLabelShape = this.createOffLabel('800').addTo(this.centerGroup); + this.onCenterGroup = this.svgShape.group(); + this.onCircleShape = this.svgShape.circle(powerButtonShapeSize - 30).center(cx, cy) + .addTo(this.onCenterGroup); + this.onLabelShape = this.createOnLabel('800'); + this.createMask(this.onCircleShape, [this.onLabelShape]); + this.pressedShadow = new InnerShadowCircle(this.svgShape, powerButtonShapeSize - 30, cx, cy, 0, 0); + this.backgroundShape.addClass('tb-small-shadow'); + + this.pressedTimeline = new Timeline(); + this.centerGroup.timeline(this.pressedTimeline); + this.onCenterGroup.timeline(this.pressedTimeline); + this.onLabelShape.timeline(this.pressedTimeline); + this.pressedShadow.timeline(this.pressedTimeline); + } + + protected drawColorState(mainColor: PowerButtonColor){ + if (this.disabled) { + this.outerBorder.attr({ fill: '#000000', 'fill-opacity': 0.03}); + } else { + this.outerBorder.fill(this.outerBorderGradient); + this.outerBorder.attr({ 'fill-opacity': 1 }); + } + this.innerBorder.attr({fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.offLabelShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + this.onCircleShape.attr({ fill: mainColor.hex, 'fill-opacity': mainColor.opacity}); + } + + protected drawOff() { + this.onCenterGroup.hide(); + this.centerGroup.show(); + this.innerBorder.show(); + } + + protected drawOn() { + this.innerBorder.hide(); + this.centerGroup.hide(); + this.onCenterGroup.show(); + } + + protected onPressStart() { + this.pressedTimeline.finish(); + const pressedScale = 0.75; + powerButtonAnimation(this.centerGroup).transform({scale: pressedScale}); + powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98}); + powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98}); + this.pressedShadow.animate(6, 0.6); + } + + protected onPressEnd() { + this.pressedTimeline.finish(); + powerButtonAnimation(this.centerGroup).transform({scale: 1}); + powerButtonAnimation(this.onCenterGroup).transform({scale: 1}); + powerButtonAnimation(this.onLabelShape).transform({scale: 1}); + this.pressedShadow.animateRestore(); + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html index c1c05cf880..fd9aaca4a6 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html @@ -37,10 +37,4 @@
-
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html new file mode 100644 index 0000000000..f15892dd52 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html @@ -0,0 +1,59 @@ + +
+
+
+ +
+
+
+
{{ valueText }}
+
+
+
+ {{ leftIcon }} +
+
+ + + +
+
+
{{ settings.tickMin }}
+
+
+
{{ settings.tickMax }}
+
+
+
+
+ {{ rightIcon }} +
+
+
+ +
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss new file mode 100644 index 0000000000..0d7115fccb --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss @@ -0,0 +1,135 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +$mainColor: var(--tb-slider-main-color, #5469FF); +$hoverRippleColor: var(--tb-slider-hover-ripple-color, rgba(84, 105, 255, 0.05)); +$focusRippleColor: var(--tb-slider-focus-ripple-color, rgba(84, 105, 255, 0.2)); +$backgroundColor: var(--tb-slider-background-color, #CCD2FF); +$tickMarksColor: var(--tb-slider-tick-marks-color, #5469FF); + +$mainColorDisabled: var(--tb-slider-main-color-disabled, #9BA2B0); +$backgroundColorDisabled: var(--tb-slider-background-color-disabled, #D5D7E5); + +.tb-slider-panel { + + .mat-mdc-slider.mat-primary.tb-slider { + --mdc-slider-active-track-color: #{$mainColor}; + --mdc-slider-handle-color: #{$mainColor}; + --mdc-slider-focus-handle-color: #{$mainColor}; + --mdc-slider-hover-handle-color: #{$mainColor}; + + --mdc-slider-with-tick-marks-inactive-container-color: #{$tickMarksColor}; + --mat-mdc-slider-ripple-color: #{$mainColor}; + + --mat-mdc-slider-hover-ripple-color: #{$hoverRippleColor}; + --mat-mdc-slider-focus-ripple-color: #{$focusRippleColor}; + + --mdc-slider-inactive-track-color: #{$backgroundColor}; + + --mdc-slider-disabled-active-track-color: #{$mainColorDisabled}; + --mdc-slider-disabled-handle-color: #{$mainColorDisabled}; + + --mdc-slider-disabled-inactive-track-color: #{$backgroundColorDisabled}; + --mdc-slider-with-tick-marks-disabled-container-color: #{$mainColorDisabled}; + + --mdc-slider-handle-width: 16px; + --mdc-slider-handle-height: 16px; + } + + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + padding: 20px 24px 24px 24px; + gap: 8px; + > div:not(.tb-slider-overlay), > tb-icon { + z-index: 1; + } + .tb-slider-overlay { + position: absolute; + inset: 12px; + } + div.tb-slider-title-panel { + z-index: 2; + } + .tb-slider-content { + flex: 1; + min-height: 0; + display: flex; + position: relative; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 12px; + .tb-slider-value-container { + min-height: 0; + } + .tb-slider-value { + white-space: nowrap; + } + .tb-slider-container { + align-self: stretch; + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 8px; + &.tb-min-height { + height: 6px; + } + .tb-slider-column { + flex: 1; + display: flex; + flex-direction: column; + gap: 4px; + .mat-mdc-slider.tb-slider { + margin: 0; + height: 6px; + min-height: 6px; + min-width: 0; + &.mdc-slider--disabled { + opacity: 1; + } + .mdc-slider__track--inactive { + opacity: 1; + } + .mdc-slider__tick-marks { + .mdc-slider__tick-mark--active { + display: none; + } + .mdc-slider__tick-mark--inactive { + opacity: 1; + } + } + .mdc-slider__thumb.mat-mdc-slider-visual-thumb { + top: -21px; + .mat-ripple { + overflow: visible; + } + } + .mdc-slider__value-indicator-text { + white-space: nowrap; + } + } + .tb-slider-ticks { + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: space-between; + } + } + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts new file mode 100644 index 0000000000..37b5319d44 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts @@ -0,0 +1,347 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + AfterViewInit, + ChangeDetectorRef, + Component, + ElementRef, + OnDestroy, + OnInit, + Renderer2, + ViewChild, + ViewEncapsulation +} from '@angular/core'; +import { BasicActionWidgetComponent, ValueSetter } from '@home/components/widget/lib/action/action-widget.models'; +import { + backgroundStyle, + ComponentStyle, + iconStyle, + overlayStyle, + textStyle +} from '@shared/models/widget-settings.models'; +import { Observable } from 'rxjs'; +import { ResizeObserver } from '@juggle/resize-observer'; +import { ImagePipe } from '@shared/pipe/image.pipe'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ValueType } from '@shared/models/constants'; +import { UtilsService } from '@core/services/utils.service'; +import { + SliderLayout, + sliderWidgetDefaultSettings, + SliderWidgetSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils'; +import { WidgetComponent } from '@home/components/widget/widget.component'; +import tinycolor from 'tinycolor2'; + +@Component({ + selector: 'tb-slider-widget', + templateUrl: './slider-widget.component.html', + styleUrls: ['../action/action-widget.scss', './slider-widget.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class SliderWidgetComponent extends + BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy { + + @ViewChild('sliderContent', {static: false}) + sliderContent: ElementRef; + + @ViewChild('sliderValueContainer', {static: false}) + sliderValueContainer: ElementRef; + + @ViewChild('sliderValue', {static: false}) + sliderValue: ElementRef; + + @ViewChild('sliderTickMinContainer', {static: false}) + sliderTickMinContainer: ElementRef; + + @ViewChild('sliderTickMin', {static: false}) + sliderTickMin: ElementRef; + + @ViewChild('sliderTickMaxContainer', {static: false}) + sliderTickMaxContainer: ElementRef; + + @ViewChild('sliderTickMax', {static: false}) + sliderTickMax: ElementRef; + + @ViewChild('leftSliderIconContainer', {static: false, read: ElementRef}) + leftSliderIconContainer: ElementRef; + + @ViewChild('leftSliderIcon', {static: false, read: ElementRef}) + leftSliderIcon: ElementRef; + + @ViewChild('rightSliderIconContainer', {static: false, read: ElementRef}) + rightSliderIconContainer: ElementRef; + + @ViewChild('rightSliderIcon', {static: false, read: ElementRef}) + rightSliderIcon: ElementRef; + + settings: SliderWidgetSettings; + + backgroundStyle$: Observable; + overlayStyle: ComponentStyle = {}; + + value: number = null; + private prevValue: number = null; + + disabled = false; + + layout: SliderLayout; + + showValue = true; + valueText = 'N/A'; + valueStyle: ComponentStyle = {}; + + showLeftRightIcon = false; + leftIcon = ''; + leftIconStyle: ComponentStyle = {}; + rightIcon = ''; + rightIconStyle: ComponentStyle = {}; + + showTicks = true; + ticksStyle: ComponentStyle = {}; + + sliderStep: number = undefined; + + autoScale = false; + + showWidgetTitlePanel = this.widgetComponent.dashboardWidget.showWidgetTitlePanel; + + sliderValueText = this._sliderValueText.bind(this); + + private panelResize$: ResizeObserver; + + private valueSetter: ValueSetter; + + private sliderCssClass: string; + + constructor(protected imagePipe: ImagePipe, + protected sanitizer: DomSanitizer, + private renderer: Renderer2, + private utils: UtilsService, + private widgetComponent: WidgetComponent, + protected cd: ChangeDetectorRef, + private elementRef: ElementRef) { + super(cd); + } + + ngOnInit(): void { + super.ngOnInit(); + this.settings = {...sliderWidgetDefaultSettings, ...this.ctx.settings}; + + this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer); + this.overlayStyle = overlayStyle(this.settings.background.overlay); + + this.layout = this.settings.layout; + + this.autoScale = this.settings.autoScale; + + this.showValue = this.layout !== SliderLayout.simplified && this.settings.showValue; + this.valueStyle = textStyle(this.settings.valueFont); + this.valueStyle.color = this.settings.valueColor; + + this.showLeftRightIcon = this.layout === SliderLayout.extended; + if (this.showLeftRightIcon) { + this.leftIcon = this.settings.leftIcon; + this.leftIconStyle = iconStyle(this.settings.leftIconSize, this.settings.leftIconSizeUnit ); + this.rightIcon = this.settings.rightIcon; + this.rightIconStyle = iconStyle(this.settings.rightIconSize, this.settings.rightIconSizeUnit ); + if (!this.autoScale) { + const leftIconMargin = this.settings.leftIconSize / 2 + (this.settings.leftIconSizeUnit || 'px'); + this.leftIconStyle.marginTop = `calc(-${leftIconMargin} + 3px)`; + const rightIconMargin = this.settings.rightIconSize / 2 + (this.settings.rightIconSizeUnit || 'px'); + this.rightIconStyle.marginTop = `calc(-${rightIconMargin} + 3px)`; + } + } + + this.showTicks = this.settings.showTicks; + if (this.showTicks) { + this.ticksStyle = textStyle(this.settings.ticksFont); + this.ticksStyle.color = this.settings.ticksColor; + } + + if (this.settings.showTickMarks) { + const range = this.settings.tickMax - this.settings.tickMin; + this.sliderStep = range / (this.settings.tickMarksCount - 1); + } + + const mainColorInstance = tinycolor(this.settings.mainColor); + const hoverRippleColor = mainColorInstance.clone().setAlpha(mainColorInstance.getAlpha() * 0.05).toRgbString(); + const focusRippleColor = mainColorInstance.clone().setAlpha(mainColorInstance.getAlpha() * 0.2).toRgbString(); + + const sliderVariablesCss = `.tb-slider-panel {\n`+ + `--tb-slider-main-color: ${this.settings.mainColor};\n`+ + `--tb-slider-background-color: ${this.settings.backgroundColor};\n`+ + `--tb-slider-hover-ripple-color: ${hoverRippleColor};\n`+ + `--tb-slider-focus-ripple-color: ${focusRippleColor};\n`+ + `--tb-slider-tick-marks-color: ${this.settings.tickMarksColor};\n`+ + `--tb-slider-main-color-disabled: ${this.settings.mainColorDisabled};\n`+ + `--tb-slider-background-disabled: ${this.settings.backgroundColorDisabled};\n`+ + `}`; + this.sliderCssClass = + this.utils.applyCssToElement(this.renderer, this.elementRef.nativeElement, 'tb-slider', sliderVariablesCss); + + const getInitialStateSettings = + {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.slider.initial-value')}; + this.createValueGetter(getInitialStateSettings, ValueType.INTEGER, { + next: (value) => this.onValue(value) + }); + + const disabledStateSettings = + {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.disabled-state')}; + this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onDisabled(value) + }); + + const valueChangeSettings = {...this.settings.valueChange, + actionLabel: this.ctx.translate.instant('widgets.slider.on-value-change')}; + this.valueSetter = this.createValueSetter(valueChangeSettings); + } + + ngAfterViewInit(): void { + if (this.autoScale) { + this.panelResize$ = new ResizeObserver(() => { + this.onResize(); + }); + this.panelResize$.observe(this.sliderContent.nativeElement); + if (this.showValue) { + this.panelResize$.observe(this.sliderValueContainer.nativeElement); + } + this.onResize(); + } + super.ngAfterViewInit(); + } + + ngOnDestroy() { + if (this.panelResize$) { + this.panelResize$.disconnect(); + } + if (this.sliderCssClass) { + this.utils.clearCssElement(this.renderer, this.sliderCssClass); + } + super.ngOnDestroy(); + } + + public onInit() { + super.onInit(); + const borderRadius = this.ctx.$widgetElement.css('borderRadius'); + this.overlayStyle = {...this.overlayStyle, ...{borderRadius}}; + this.cd.detectChanges(); + } + + public onSliderChange() { + this.updateValueText(); + if (!this.ctx.isEdit && !this.ctx.isPreview) { + const prevValue = this.prevValue; + const targetValue = this.value; + this.updateValue(this.valueSetter, targetValue, { + next: () => this.onValue(targetValue), + error: () => this.onValue(prevValue) + }); + } + } + + private _sliderValueText(value: number): string { + return formatValue(value, this.settings.valueDecimals, this.settings.valueUnits, false); + } + + private onValue(value: number): void { + this.value = value; + this.prevValue = value; + this.updateValueText(); + this.cd.markForCheck(); + } + + private updateValueText() { + if (isDefinedAndNotNull(this.value) && isNumeric(this.value)) { + this.valueText = formatValue(this.value, this.settings.valueDecimals, this.settings.valueUnits, false); + } else { + this.valueText = 'N/A'; + } + } + + private onDisabled(value: boolean): void { + this.disabled = !!value; + this.cd.markForCheck(); + } + + private onResize() { + const panelWidth = this.sliderContent.nativeElement.getBoundingClientRect().width; + const panelHeight = this.sliderContent.nativeElement.getBoundingClientRect().height; + + if (this.showValue) { + this.resetScale(this.sliderValueContainer.nativeElement, this.sliderValue.nativeElement); + } + + if (this.showLeftRightIcon) { + this.resetScale(this.leftSliderIconContainer.nativeElement, this.leftSliderIcon.nativeElement); + this.resetScale(this.rightSliderIconContainer.nativeElement, this.rightSliderIcon.nativeElement); + } + + if (this.showTicks) { + this.resetScale(this.sliderTickMinContainer.nativeElement, this.sliderTickMin.nativeElement); + this.resetScale(this.sliderTickMaxContainer.nativeElement, this.sliderTickMax.nativeElement); + } + + let minAspect = 0.2; + let avgContentHeight = 35; + if (this.showTicks) { + minAspect += 0.1; + avgContentHeight += 20; + } + if (this.showValue) { + minAspect += 0.1; + avgContentHeight += 50; + } + const aspect = Math.min(panelHeight / panelWidth, minAspect); + const targetHeight = panelWidth * aspect; + const scale = targetHeight / avgContentHeight; + + if (this.showValue) { + this.updateScale(this.sliderValueContainer.nativeElement, this.sliderValue.nativeElement, scale); + } + if (this.showLeftRightIcon) { + const leftIconContainerRect = this.leftSliderIconContainer.nativeElement.getBoundingClientRect(); + const leftIconContainerMarginTop = -(leftIconContainerRect.width * scale) / 2 + 3; + this.renderer.setStyle(this.leftSliderIconContainer.nativeElement, 'marginTop', `${leftIconContainerMarginTop}px`); + this.updateScale(this.leftSliderIconContainer.nativeElement, this.leftSliderIcon.nativeElement, scale, true); + const rightIconContainerRect = this.rightSliderIconContainer.nativeElement.getBoundingClientRect(); + const rightIconContainerMarginTop = -(rightIconContainerRect.width * scale) / 2 + 3; + this.renderer.setStyle(this.rightSliderIconContainer.nativeElement, 'marginTop', `${rightIconContainerMarginTop}px`); + this.updateScale(this.rightSliderIconContainer.nativeElement, this.rightSliderIcon.nativeElement, scale, true); + } + if (this.showTicks) { + this.updateScale(this.sliderTickMinContainer.nativeElement, this.sliderTickMin.nativeElement, scale); + this.updateScale(this.sliderTickMaxContainer.nativeElement, this.sliderTickMax.nativeElement, scale); + } + } + + private resetScale(container: HTMLElement, element: HTMLElement): void { + this.renderer.setStyle(container, 'width', ''); + this.renderer.setStyle(container, 'height', ''); + this.renderer.setStyle(element, 'transform', ''); + } + + private updateScale(container: HTMLElement, element: HTMLElement, scale: number, sameHeight = false): void { + const rect = container.getBoundingClientRect(); + this.renderer.setStyle(container, 'width', `${rect.width * scale}px`); + this.renderer.setStyle(container, 'height', `${(sameHeight ? rect.width : rect.height) * scale}px`); + this.renderer.setStyle(element, 'transform', `scale(${scale})`); + this.renderer.setStyle(element, 'transform-origin', 'left top'); + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts new file mode 100644 index 0000000000..c6fe1e290a --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts @@ -0,0 +1,196 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + DataToValueType, + GetValueAction, + GetValueSettings, + SetValueAction, + SetValueSettings, + ValueToDataType +} from '@shared/models/action-widget-settings.models'; +import { BackgroundSettings, BackgroundType, cssUnit, Font } from '@shared/models/widget-settings.models'; +import { AttributeScope } from '@shared/models/telemetry/telemetry.models'; + +export enum SliderLayout { + default = 'default', + extended = 'extended', + simplified = 'simplified' +} + +export const sliderLayouts = Object.keys(SliderLayout) as SliderLayout[]; + +export const sliderLayoutTranslations = new Map( + [ + [SliderLayout.default, 'widgets.slider.layout-default'], + [SliderLayout.extended, 'widgets.slider.layout-extended'], + [SliderLayout.simplified, 'widgets.slider.layout-simplified'] + ] +); + +export const sliderLayoutImages = new Map( + [ + [SliderLayout.default, 'assets/widget/slider/default-layout.svg'], + [SliderLayout.extended, 'assets/widget/slider/extended-layout.svg'], + [SliderLayout.simplified, 'assets/widget/slider/simplified-layout.svg'] + ] +); + +export interface SliderWidgetSettings { + initialState: GetValueSettings; + disabledState: GetValueSettings; + valueChange: SetValueSettings; + layout: SliderLayout; + autoScale: boolean; + showValue: boolean; + valueUnits: string; + valueDecimals: number; + valueFont: Font; + valueColor: string; + showTicks: boolean; + tickMin: number; + tickMax: number; + ticksFont: Font; + ticksColor: string; + showTickMarks: boolean; + tickMarksCount: number; + tickMarksColor: string; + mainColor: string; + backgroundColor: string; + mainColorDisabled: string; + backgroundColorDisabled: string; + leftIcon: string; + leftIconSize: number; + leftIconSizeUnit: cssUnit; + leftIconColor: string; + rightIcon: string; + rightIconSize: number; + rightIconSizeUnit: cssUnit; + rightIconColor: string; + background: BackgroundSettings; +} + +export const sliderWidgetDefaultSettings: SliderWidgetSettings = { + initialState: { + action: GetValueAction.EXECUTE_RPC, + defaultValue: 0, + executeRpc: { + method: 'getState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return integer value */\nreturn data;' + } + }, + disabledState: { + action: GetValueAction.DO_NOTHING, + defaultValue: false, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + valueChange: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.VALUE, + constantValue: 0, + valueToDataFunction: '/* Convert input integer value to RPC parameters or attribute/time-series value */\nreturn value;' + } + }, + layout: SliderLayout.default, + autoScale: true, + showValue: true, + valueUnits: '%', + valueDecimals: 0, + valueFont: { + family: 'Roboto', + size: 36, + sizeUnit: 'px', + style: 'normal', + weight: '500', + lineHeight: '36px' + }, + valueColor: 'rgba(0, 0, 0, 0.87)', + showTicks: true, + tickMin: 0, + tickMax: 100, + ticksFont: { + family: 'Roboto', + size: 11, + sizeUnit: 'px', + style: 'normal', + weight: '400', + lineHeight: '16px' + }, + ticksColor: 'rgba(0,0,0,0.54)', + showTickMarks: true, + tickMarksCount: 11, + tickMarksColor: '#5469FF', + mainColor: '#5469FF', + backgroundColor: '#CCD2FF', + mainColorDisabled: '#9BA2B0', + backgroundColorDisabled: '#D5D7E5', + leftIcon: 'lightbulb', + leftIconSize: 24, + leftIconSizeUnit: 'px', + leftIconColor: '#5469FF', + rightIcon: 'mdi:lightbulb-on', + rightIconSize: 24, + rightIconSizeUnit: 'px', + rightIconColor: '#5469FF', + background: { + type: BackgroundType.color, + color: '#fff', + overlay: { + enabled: false, + color: 'rgba(255,255,255,0.72)', + blur: 3 + } + } +}; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html new file mode 100644 index 0000000000..b37030c884 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html @@ -0,0 +1,142 @@ + + +
+
widgets.power-button.behavior
+
+
widgets.rpc-state.initial-state
+ +
+
+
widgets.power-button.power-on
+ +
+
+
widgets.power-button.power-off
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.card-style
+ + + {{ powerButtonLayoutTranslationMap.get(layout) | translate }} + + +
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
+
widgets.power-button.button
+
+
{{ 'widgets.power-button.power-on-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+
{{ 'widgets.power-button.power-off-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+
{{ 'widgets.power-button.disabled-colors' | translate }}
+
+
+
widgets.power-button.main
+ + +
+ +
+
widgets.power-button.background
+ + +
+
+
+
+ diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.ts new file mode 100644 index 0000000000..c1d9f98460 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.ts @@ -0,0 +1,88 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ValueType } from '@shared/models/constants'; +import { + powerButtonDefaultSettings, + powerButtonLayoutImages, + powerButtonLayouts, + powerButtonLayoutTranslations +} from '@home/components/widget/lib/rpc/power-button-widget.models'; + +@Component({ + selector: 'tb-power-button-widget-settings', + templateUrl: './power-button-widget-settings.component.html', + styleUrls: ['./../widget-settings.scss'] +}) +export class PowerButtonWidgetSettingsComponent extends WidgetSettingsComponent { + + get targetDevice(): TargetDevice { + return this.widgetConfig?.config?.targetDevice; + } + + get widgetType(): widgetType { + return this.widgetConfig?.widgetType; + } + + powerButtonLayouts = powerButtonLayouts; + + powerButtonLayoutTranslationMap = powerButtonLayoutTranslations; + powerButtonLayoutImageMap = powerButtonLayoutImages; + + valueType = ValueType; + + powerButtonWidgetSettingsForm: UntypedFormGroup; + + constructor(protected store: Store, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.powerButtonWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...powerButtonDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.powerButtonWidgetSettingsForm = this.fb.group({ + initialState: [settings.initialState, []], + onUpdateState: [settings.onUpdateState, []], + offUpdateState: [settings.offUpdateState, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + + mainColorOn: [settings.mainColorOn, []], + backgroundColorOn: [settings.backgroundColorOn, []], + + mainColorOff: [settings.mainColorOff, []], + backgroundColorOff: [settings.backgroundColorOff, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + background: [settings.background, []] + }); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html index de641b8808..31c8276666 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html @@ -35,7 +35,7 @@ {{ 'widgets.progress-bar.auto-scale' | translate }}
-
+
{{ 'widgets.progress-bar.value' | translate }} @@ -48,7 +48,7 @@
-
+
{{ 'widgets.progress-bar.range' | translate }}
widgets.progress-bar.min
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html index b1fccafac0..4cf5857612 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html @@ -97,7 +97,8 @@
{{ (setValueSettingsFormGroup.get('action').value === setValueAction.EXECUTE_RPC ? 'widgets.value-action.parameters' : 'widgets.value-action.value') | translate }}
- {{ 'widgets.value-action.converter-constant' | translate }} + {{ 'widgets.value-action.converter-value' | translate }} + {{ 'widgets.value-action.converter-constant' | translate }} {{ 'widgets.value-action.converter-function' | translate }} {{ 'widgets.value-action.converter-none' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts index d718168b11..819ed2a3fc 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts @@ -32,6 +32,7 @@ import { TargetDevice, widgetType } from '@shared/models/widget.models'; import { AttributeScope, DataKeyType, telemetryTypeTranslationsShort } from '@shared/models/telemetry/telemetry.models'; import { IAliasController } from '@core/api/widget-api.models'; import { WidgetService } from '@core/http/widget.service'; +import { ValueType } from '@shared/models/constants'; @Component({ selector: 'tb-set-value-action-settings-panel', @@ -45,6 +46,9 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen @Input() panelTitle: string; + @Input() + valueType = ValueType.BOOLEAN; + @Input() setValueSettings: SetValueSettings; @@ -79,6 +83,8 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen functionScopeVariables = this.widgetService.getWidgetScopeVariables(); + ValueType = ValueType; + setValueSettingsFormGroup: UntypedFormGroup; constructor(private fb: UntypedFormBuilder, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts index fce1e23673..7b4c8e0428 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts @@ -36,6 +36,7 @@ import { isDefinedAndNotNull } from '@core/utils'; import { SetValueActionSettingsPanelComponent } from '@home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component'; +import { ValueType } from '@shared/models/constants'; @Component({ selector: 'tb-set-value-action-settings', @@ -58,6 +59,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce @Input() panelTitle: string; + @Input() + valueType = ValueType.BOOLEAN; + @Input() aliasController: IAliasController; @@ -114,6 +118,7 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce const ctx: any = { setValueSettings: this.modelValue, panelTitle: this.panelTitle, + valueType: this.valueType, aliasController: this.aliasController, targetDevice: this.targetDevice, widgetType: this.widgetType @@ -137,6 +142,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce private updateDisplayValue() { let value: any; switch (this.modelValue.valueToData.type) { + case ValueToDataType.VALUE: + value = 'value'; + break; case ValueToDataType.CONSTANT: value = this.modelValue.valueToData.constantValue; break; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html index 35ca3f3144..3752fb3b3c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html @@ -80,6 +80,22 @@
+ +
+
{{ 'widget-action.URL' | translate }}
+ + + + warning + + +
+ @@ -89,7 +105,8 @@
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts index c93a05fafd..6c2cd3fb8f 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts @@ -279,6 +279,16 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali this.fb.control(action ? action.mobileAction : null, [Validators.required]) ); break; + case WidgetActionType.openURL: + this.actionTypeFormGroup.addControl( + 'openNewBrowserTab', + this.fb.control(action ? action.openNewBrowserTab : false, []) + ); + this.actionTypeFormGroup.addControl( + 'url', + this.fb.control(action ? action.url : null, [Validators.required]) + ); + break; } } this.actionTypeFormGroupSubscriptions.push( diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html index b4ce9c8ce2..bdecc9d36b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html @@ -56,7 +56,7 @@
-
+
{{ 'widgets.button.color-palette' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html index 9350c2d932..9208efd68a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html @@ -81,7 +81,7 @@ {{ 'widgets.single-switch.auto-scale' | translate }}
-
+
{{ 'widgets.single-switch.label' | translate }} @@ -98,7 +98,7 @@
-
+
{{ 'widgets.single-switch.icon' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html new file mode 100644 index 0000000000..0f3c3f11a3 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html @@ -0,0 +1,216 @@ + + +
+
widgets.slider.behavior
+
+
widgets.slider.initial-value
+ +
+
+
widgets.slider.on-value-change
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.card-style
+ + + {{ sliderLayoutTranslationMap.get(layout) | translate }} + + +
+ + {{ 'widgets.slider.auto-scale' | translate }} + +
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
+
widgets.slider.slider
+
+ + {{ 'widgets.slider.value' | translate }} + +
+ + + +
widget-config.decimals-suffix
+ + + + + +
+
+
+
{{ 'widgets.slider.range' | translate }}
+
+
widgets.slider.min
+ + + +
widgets.slider.max
+ + + +
+
+
+ + {{ 'widgets.slider.range-ticks' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.slider.tick-marks' | translate }} + +
+ + + + + +
+
+
+
{{ 'widgets.slider.colors' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
{{ 'widgets.rpc-state.disabled-state' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
+ {{ 'widgets.slider.left-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+ {{ 'widgets.slider.right-icon' | translate }} +
+
+ + + + + + + + +
+
+
+ diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts new file mode 100644 index 0000000000..a215a93d88 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts @@ -0,0 +1,186 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ValueType } from '@shared/models/constants'; +import { + SliderLayout, + sliderLayoutImages, + sliderLayouts, + sliderLayoutTranslations, + sliderWidgetDefaultSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { formatValue } from '@core/utils'; + +@Component({ + selector: 'tb-slider-widget-settings', + templateUrl: './slider-widget-settings.component.html', + styleUrls: ['./../widget-settings.scss'] +}) +export class SliderWidgetSettingsComponent extends WidgetSettingsComponent { + + get targetDevice(): TargetDevice { + return this.widgetConfig?.config?.targetDevice; + } + + get widgetType(): widgetType { + return this.widgetConfig?.widgetType; + } + + sliderLayout = SliderLayout; + + sliderLayouts = sliderLayouts; + + sliderLayoutTranslationMap = sliderLayoutTranslations; + sliderLayoutImageMap = sliderLayoutImages; + + valueType = ValueType; + + sliderWidgetSettingsForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.sliderWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...sliderWidgetDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.sliderWidgetSettingsForm = this.fb.group({ + initialState: [settings.initialState, []], + valueChange: [settings.valueChange, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + autoScale: [settings.autoScale, []], + + showValue: [settings.showValue, []], + valueUnits: [settings.valueUnits, []], + valueDecimals: [settings.valueDecimals, []], + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + tickMin: [settings.tickMin, []], + tickMax: [settings.tickMax, []], + + showTicks: [settings.showTicks, []], + ticksFont: [settings.ticksFont, []], + ticksColor: [settings.ticksColor, []], + + showTickMarks: [settings.showTickMarks, []], + tickMarksCount: [settings.tickMarksCount, [Validators.min(2)]], + tickMarksColor: [settings.tickMarksColor, []], + + mainColor: [settings.mainColor, []], + backgroundColor: [settings.backgroundColor, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + leftIconSize: [settings.leftIconSize, [Validators.min(0)]], + leftIconSizeUnit: [settings.leftIconSizeUnit, []], + leftIcon: [settings.leftIcon, []], + leftIconColor: [settings.leftIconColor, []], + + rightIconSize: [settings.rightIconSize, [Validators.min(0)]], + rightIconSizeUnit: [settings.rightIconSizeUnit, []], + rightIcon: [settings.rightIcon, []], + rightIconColor: [settings.rightIconColor, []], + + background: [settings.background, []], + }); + } + + protected validatorTriggers(): string[] { + return ['showValue', 'showTicks', 'showTickMarks', 'layout']; + } + + protected updateValidators(_emitEvent: boolean): void { + const showValue: boolean = this.sliderWidgetSettingsForm.get('showValue').value; + const showTicks: boolean = this.sliderWidgetSettingsForm.get('showTicks').value; + const showTickMarks: boolean = this.sliderWidgetSettingsForm.get('showTickMarks').value; + const layout: SliderLayout = this.sliderWidgetSettingsForm.get('layout').value; + + const valueEnabled = layout !== SliderLayout.simplified; + const leftRightIconsEnabled = layout === SliderLayout.extended; + + if (valueEnabled && showValue) { + this.sliderWidgetSettingsForm.get('valueUnits').enable(); + this.sliderWidgetSettingsForm.get('valueDecimals').enable(); + this.sliderWidgetSettingsForm.get('valueFont').enable(); + this.sliderWidgetSettingsForm.get('valueColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('valueUnits').disable(); + this.sliderWidgetSettingsForm.get('valueDecimals').disable(); + this.sliderWidgetSettingsForm.get('valueFont').disable(); + this.sliderWidgetSettingsForm.get('valueColor').disable(); + } + + if (showTicks) { + this.sliderWidgetSettingsForm.get('ticksFont').enable(); + this.sliderWidgetSettingsForm.get('ticksColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('ticksFont').disable(); + this.sliderWidgetSettingsForm.get('ticksColor').disable(); + } + + if (showTickMarks) { + this.sliderWidgetSettingsForm.get('tickMarksCount').enable(); + this.sliderWidgetSettingsForm.get('tickMarksColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('tickMarksCount').disable(); + this.sliderWidgetSettingsForm.get('tickMarksColor').disable(); + } + + if (leftRightIconsEnabled) { + this.sliderWidgetSettingsForm.get('leftIconSize').enable(); + this.sliderWidgetSettingsForm.get('leftIconSizeUnit').enable(); + this.sliderWidgetSettingsForm.get('leftIcon').enable(); + this.sliderWidgetSettingsForm.get('leftIconColor').enable(); + this.sliderWidgetSettingsForm.get('rightIconSize').enable(); + this.sliderWidgetSettingsForm.get('rightIconSizeUnit').enable(); + this.sliderWidgetSettingsForm.get('rightIcon').enable(); + this.sliderWidgetSettingsForm.get('rightIconColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('leftIconSize').disable(); + this.sliderWidgetSettingsForm.get('leftIconSizeUnit').disable(); + this.sliderWidgetSettingsForm.get('leftIcon').disable(); + this.sliderWidgetSettingsForm.get('leftIconColor').disable(); + this.sliderWidgetSettingsForm.get('rightIconSize').disable(); + this.sliderWidgetSettingsForm.get('rightIconSizeUnit').disable(); + this.sliderWidgetSettingsForm.get('rightIcon').disable(); + this.sliderWidgetSettingsForm.get('rightIconColor').disable(); + } + } + + private _valuePreviewFn(): string { + const units: string = this.sliderWidgetSettingsForm.get('valueUnits').value; + const decimals: number = this.sliderWidgetSettingsForm.get('valueDecimals').value; + return formatValue(48, decimals, units, false); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.html index e742475e80..0040e7fa64 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.html @@ -19,8 +19,8 @@
-
-
widgets.liquid-level-card.shape
+
+
widgets.liquid-level-card.shape
{{ DataSourceTypeTranslations.get(type) | translate }} @@ -51,7 +51,7 @@ formControlName="shapeAttributeName">
-
+
widgets.liquid-level-card.shape-by-attribute
-
+
widgets.liquid-level-card.widget-units
-
+
@@ -111,9 +111,9 @@
-
+
widgets.liquid-level-card.total-volume
-
+
@@ -141,10 +141,30 @@ formControlName="volumeAttributeName"> - +
+
+
widgets.liquid-level-card.total-volume-units
+
+ + + + {{ DataSourceTypeTranslations.get(type) | translate }} + + + + + + + +
@@ -168,7 +188,7 @@
widgets.liquid-level-card.value
-
+
@@ -178,7 +198,7 @@
widgets.liquid-level-card.total-volume
-
+
@@ -212,7 +232,7 @@ {{ 'widgets.liquid-level-card.level' | translate }} -
+
@@ -232,7 +252,7 @@ {{ 'widgets.value-card.date' | translate }} -
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts index 5ed3bea446..e25e02d1b7 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/liquid-level-card-widget-settings.component.ts @@ -158,7 +158,9 @@ export class LiquidLevelCardWidgetSettingsComponent extends WidgetSettingsCompon volumeSource: [settings.volumeSource, []], volumeConstant: [settings.volumeConstant, [Validators.required, Validators.min(0.1)]], volumeAttributeName: [settings.volumeAttributeName, [Validators.required]], + volumeUnitsSource: [settings.volumeUnitsSource, []], volumeUnits: [settings.volumeUnits, [Validators.required]], + volumeUnitsAttributeName: [settings.volumeUnitsAttributeName, [Validators.required]], volumeFont: [settings.volumeFont, []], volumeColor: [settings.volumeColor, []], valueFont: [settings.valueFont, []], @@ -195,7 +197,7 @@ export class LiquidLevelCardWidgetSettingsComponent extends WidgetSettingsCompon protected validatorTriggers(): string[] { return [ 'showBackgroundOverlay', 'showTooltip', 'showTooltipLevel', 'tankSelectionType', 'datasourceUnits', - 'showTooltipDate', 'layout', 'volumeSource', 'widgetUnitsSource' + 'showTooltipDate', 'layout', 'volumeSource', 'widgetUnitsSource', 'volumeUnitsSource' ]; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts index 3f4a619c49..8fc6ef96c2 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts @@ -321,6 +321,12 @@ import { import { CommandButtonWidgetSettingsComponent } from '@home/components/widget/lib/settings/button/command-button-widget-settings.component'; +import { + PowerButtonWidgetSettingsComponent +} from '@home/components/widget/lib/settings/button/power-button-widget-settings.component'; +import { + SliderWidgetSettingsComponent +} from '@home/components/widget/lib/settings/control/slider-widget-settings.component'; @NgModule({ declarations: [ @@ -436,7 +442,9 @@ import { BarChartWithLabelsWidgetSettingsComponent, SingleSwitchWidgetSettingsComponent, ActionButtonWidgetSettingsComponent, - CommandButtonWidgetSettingsComponent + CommandButtonWidgetSettingsComponent, + PowerButtonWidgetSettingsComponent, + SliderWidgetSettingsComponent ], imports: [ CommonModule, @@ -557,7 +565,9 @@ import { BarChartWithLabelsWidgetSettingsComponent, SingleSwitchWidgetSettingsComponent, ActionButtonWidgetSettingsComponent, - CommandButtonWidgetSettingsComponent + CommandButtonWidgetSettingsComponent, + PowerButtonWidgetSettingsComponent, + SliderWidgetSettingsComponent ] }) export class WidgetSettingsModule { @@ -645,5 +655,7 @@ export const widgetSettingsComponentsMap: {[key: string]: Type 0) { diff --git a/ui-ngx/src/app/modules/home/home.component.ts b/ui-ngx/src/app/modules/home/home.component.ts index 2217b5bf5d..d6c07004c0 100644 --- a/ui-ngx/src/app/modules/home/home.component.ts +++ b/ui-ngx/src/app/modules/home/home.component.ts @@ -15,7 +15,7 @@ /// import { AfterViewInit, Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { startWith, skip, Subject } from 'rxjs'; +import { skip, startWith, Subject } from 'rxjs'; import { Store } from '@ngrx/store'; import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators'; @@ -32,6 +32,8 @@ import { instanceOfSearchableComponent, ISearchableComponent } from '@home/model import { ActiveComponentService } from '@core/services/active-component.service'; import { RouterTabsComponent } from '@home/components/router-tabs.component'; import { FormBuilder } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; +import { isDefined, isDefinedAndNotNull } from '@core/utils'; @Component({ selector: 'tb-home', @@ -70,8 +72,8 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni constructor(protected store: Store, @Inject(WINDOW) private window: Window, private activeComponentService: ActiveComponentService, - public breakpointObserver: BreakpointObserver, - private fb: FormBuilder) { + private fb: FormBuilder, + public breakpointObserver: BreakpointObserver) { super(store); } @@ -144,9 +146,18 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni private updateActiveComponent(activeComponent: any) { this.showSearch = false; + this.hideLoadingBar = false; this.textSearch.reset('', {emitEvent: false}); this.activeComponent = activeComponent; - this.hideLoadingBar = activeComponent && activeComponent instanceof RouterTabsComponent; + + if (activeComponent && activeComponent instanceof RouterTabsComponent + && isDefinedAndNotNull(this.activeComponent.activatedRoute?.snapshot?.data?.showMainLoadingBar)) { + this.hideLoadingBar = !this.activeComponent.activatedRoute.snapshot.data.showMainLoadingBar; + } else if (activeComponent && activeComponent instanceof PageComponent + && isDefinedAndNotNull(this.activeComponent?.showMainLoadingBar)) { + this.hideLoadingBar = !this.activeComponent.showMainLoadingBar; + } + if (this.activeComponent && instanceOfSearchableComponent(this.activeComponent)) { this.searchEnabled = true; this.searchableComponent = this.activeComponent; diff --git a/ui-ngx/src/app/modules/home/models/widget-component.models.ts b/ui-ngx/src/app/modules/home/models/widget-component.models.ts index a834120dc6..2ea34377d6 100644 --- a/ui-ngx/src/app/modules/home/models/widget-component.models.ts +++ b/ui-ngx/src/app/modules/home/models/widget-component.models.ts @@ -57,6 +57,7 @@ import { createLabelFromDatasource, createLabelFromSubscriptionEntityInfo, formatValue, + getEntityDetailsPageURL, hasDatasourceLabelsVariables, isDefined } from '@core/utils'; @@ -253,7 +254,8 @@ export class WidgetContext { }; utils: IWidgetUtils = { - formatValue + formatValue, + getEntityDetailsPageURL }; $widgetElement: JQuery; @@ -347,35 +349,35 @@ export class WidgetContext { showSuccessToast(message: string, duration: number = 1000, verticalPosition: NotificationVerticalPosition = 'bottom', horizontalPosition: NotificationHorizontalPosition = 'left', - target: string = 'dashboardRoot') { - this.showToast('success', message, duration, verticalPosition, horizontalPosition, target); + target: string = 'dashboardRoot', modern = false) { + this.showToast('success', message, duration, verticalPosition, horizontalPosition, target, modern); } showInfoToast(message: string, verticalPosition: NotificationVerticalPosition = 'bottom', horizontalPosition: NotificationHorizontalPosition = 'left', - target: string = 'dashboardRoot') { - this.showToast('info', message, undefined, verticalPosition, horizontalPosition, target); + target: string = 'dashboardRoot', modern = false) { + this.showToast('info', message, undefined, verticalPosition, horizontalPosition, target, modern); } showWarnToast(message: string, verticalPosition: NotificationVerticalPosition = 'bottom', horizontalPosition: NotificationHorizontalPosition = 'left', - target: string = 'dashboardRoot') { - this.showToast('warn', message, undefined, verticalPosition, horizontalPosition, target); + target: string = 'dashboardRoot', modern = false) { + this.showToast('warn', message, undefined, verticalPosition, horizontalPosition, target, modern); } showErrorToast(message: string, verticalPosition: NotificationVerticalPosition = 'bottom', horizontalPosition: NotificationHorizontalPosition = 'left', - target: string = 'dashboardRoot') { - this.showToast('error', message, undefined, verticalPosition, horizontalPosition, target); + target: string = 'dashboardRoot', modern = false) { + this.showToast('error', message, undefined, verticalPosition, horizontalPosition, target, modern); } showToast(type: NotificationType, message: string, duration: number, verticalPosition: NotificationVerticalPosition = 'bottom', horizontalPosition: NotificationHorizontalPosition = 'left', - target: string = 'dashboardRoot') { + target: string = 'dashboardRoot', modern = false) { this.store.dispatch(new ActionNotificationShow( { message, @@ -385,7 +387,8 @@ export class WidgetContext { horizontalPosition, target, panelClass: this.widgetNamespace, - forceDismiss: true + forceDismiss: true, + modern })); } diff --git a/ui-ngx/src/app/modules/home/pages/account/account-routing.module.ts b/ui-ngx/src/app/modules/home/pages/account/account-routing.module.ts index 252250ece2..20e6cc73e1 100644 --- a/ui-ngx/src/app/modules/home/pages/account/account-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/account/account-routing.module.ts @@ -33,6 +33,7 @@ const routes: Routes = [ component: RouterTabsComponent, data: { auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN, Authority.CUSTOMER_USER], + showMainLoadingBar: false, breadcrumb: { label: 'account.account', icon: 'account_circle' diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts index 74c5012791..63fb9a14de 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts @@ -136,6 +136,7 @@ const routes: Routes = [ component: RouterTabsComponent, data: { auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN], + showMainLoadingBar: false, breadcrumb: { label: 'admin.settings', icon: 'settings' diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts index 4b0ba741d3..1d346c70f1 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts @@ -15,7 +15,14 @@ /// import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, ValidationErrors, Validators } from '@angular/forms'; +import { + AbstractControl, + UntypedFormArray, + UntypedFormBuilder, + UntypedFormGroup, + ValidationErrors, + Validators +} from '@angular/forms'; import { ClientAuthenticationMethod, DomainSchema, @@ -26,9 +33,11 @@ import { MapperConfigType, OAuth2ClientRegistrationTemplate, OAuth2DomainInfo, - OAuth2Info, OAuth2MobileInfo, + OAuth2Info, + OAuth2MobileInfo, OAuth2ParamsInfo, - OAuth2RegistrationInfo, PlatformType, + OAuth2RegistrationInfo, + PlatformType, platformTypeTranslations, TenantNameStrategy } from '@shared/models/oauth2.models'; @@ -105,6 +114,8 @@ export class OAuth2SettingsComponent extends PageComponent implements OnInit, Ha templateProvider = ['Custom']; + showMainLoadingBar = false; + private loginProcessingUrl: string = this.route.snapshot.data.loginProcessingUrl; private static validateScope(control: AbstractControl): ValidationErrors | null { diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts index e4fd483eb9..17dda4a0c9 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.ts @@ -23,7 +23,8 @@ import { AbstractControl, UntypedFormBuilder, UntypedFormControl, - UntypedFormGroup, ValidationErrors, + UntypedFormGroup, + ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; @@ -35,10 +36,7 @@ import { randomAlphanumeric } from '@core/utils'; import { AuthService } from '@core/auth/auth.service'; import { DialogService } from '@core/services/dialog.service'; import { TranslateService } from '@ngx-translate/core'; -import { forkJoin, Observable, of } from 'rxjs'; -import { MatCheckboxChange } from '@angular/material/checkbox'; -import { AlarmInfo } from '@shared/models/alarm.models'; -import { QueueProcessingStrategyTypes, QueueProcessingStrategyTypesMap } from '@shared/models/queue.models'; +import { Observable, of } from 'rxjs'; @Component({ selector: 'tb-security-settings', @@ -50,6 +48,8 @@ export class SecuritySettingsComponent extends PageComponent implements HasConfi securitySettingsFormGroup: UntypedFormGroup; jwtSecuritySettingsFormGroup: UntypedFormGroup; + showMainLoadingBar = false; + private securitySettings: SecuritySettings; private jwtSettings: JwtSettings; diff --git a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.ts index 5ea4776ff9..5355114586 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.ts @@ -47,6 +47,8 @@ export class TwoFactorAuthSettingsComponent extends PageComponent implements OnI twoFactorAuthProviderType = TwoFactorAuthProviderType; twoFactorAuthProvidersData = twoFactorAuthProvidersData; + showMainLoadingBar = false; + @ViewChildren(MatExpansionPanel) expansionPanel: QueryList; constructor(protected store: Store, diff --git a/ui-ngx/src/app/modules/home/pages/home-pages.models.ts b/ui-ngx/src/app/modules/home/pages/home-pages.models.ts index 20872e3c65..848bb0b85c 100644 --- a/ui-ngx/src/app/modules/home/pages/home-pages.models.ts +++ b/ui-ngx/src/app/modules/home/pages/home-pages.models.ts @@ -30,4 +30,3 @@ export const entityDetailsPageBreadcrumbLabelFunction: BreadCrumbLabelFunction + + {{ 'notification.edge-trigger-settings' | translate }} + +
+
+ notification.filter + + + + notification.notify-on + + + {{ edgeConnectionEventTranslationMap.get(edgeEvent) | translate }} + + + +
+
+ +
+
+ + notification.description + + +
+
+ + + + {{ 'notification.edge-trigger-settings' | translate }} +
+
+
+ notification.filter + + +
+
+
+
+
+ + notification.description + + +
+
+ + {{ 'notification.entities-limit-trigger-settings' | translate }} diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts index 9604670757..34ff605027 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts @@ -68,6 +68,7 @@ import { } from '@shared/models/api-usage.models'; import { LimitedApi, LimitedApiTranslationMap } from '@shared/models/limited-api.models'; import { StringItemsOption } from '@shared/components/string-items-list.component'; +import { EdgeConnectionEvent, EdgeConnectionEventTranslationMap } from '@shared/models/edge.models'; export interface RuleNotificationDialogData { rule?: NotificationRule; @@ -98,6 +99,8 @@ export class RuleNotificationDialogComponent extends apiUsageLimitTemplateForm: FormGroup; newPlatformVersionTemplateForm: FormGroup; rateLimitsTemplateForm: FormGroup; + edgeCommunicationFailureTemplateForm: FormGroup; + edgeConnectionTemplateForm: FormGroup; triggerType = TriggerType; triggerTypes: TriggerType[]; @@ -132,6 +135,9 @@ export class RuleNotificationDialogComponent extends apiFeatures: ApiFeature[] = Object.values(ApiFeature); apiFeatureTranslationMap = ApiFeatureTranslationMap; + edgeConnectionEvents: EdgeConnectionEvent[] = Object.values(EdgeConnectionEvent); + edgeConnectionEventTranslationMap = EdgeConnectionEventTranslationMap; + limitedApis: StringItemsOption[]; entityType = EntityType; @@ -221,6 +227,19 @@ export class RuleNotificationDialogComponent extends } }); + this.edgeConnectionTemplateForm = this.fb.group({ + triggerConfig: this.fb.group({ + edges: [null], + notifyOn: [null] + }) + }); + + this.edgeCommunicationFailureTemplateForm = this.fb.group({ + triggerConfig: this.fb.group({ + edges: [null] + }) + }); + this.alarmTemplateForm = this.fb.group({ triggerConfig: this.fb.group({ alarmTypes: [null], @@ -328,7 +347,9 @@ export class RuleNotificationDialogComponent extends [TriggerType.ENTITIES_LIMIT, this.entitiesLimitTemplateForm], [TriggerType.API_USAGE_LIMIT, this.apiUsageLimitTemplateForm], [TriggerType.NEW_PLATFORM_VERSION, this.newPlatformVersionTemplateForm], - [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm] + [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm], + [TriggerType.EDGE_COMMUNICATION_FAILURE, this.edgeCommunicationFailureTemplateForm], + [TriggerType.EDGE_CONNECTION, this.edgeConnectionTemplateForm] ]); if (data.isAdd || data.isCopy) { diff --git a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html index 5d41da6b4a..ab3694773e 100644 --- a/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html +++ b/ui-ngx/src/app/shared/components/dashboard-autocomplete.component.html @@ -65,7 +65,7 @@ - > + diff --git a/ui-ngx/src/app/shared/components/json-object-edit.component.scss b/ui-ngx/src/app/shared/components/json-object-edit.component.scss index eb66f102a3..63884d518f 100644 --- a/ui-ngx/src/app/shared/components/json-object-edit.component.scss +++ b/ui-ngx/src/app/shared/components/json-object-edit.component.scss @@ -52,6 +52,7 @@ width: 100%; min-width: 200px; height: 100%; + min-height: 300px; &:not(.fill-height) { min-height: 200px; diff --git a/ui-ngx/src/app/shared/components/page.component.ts b/ui-ngx/src/app/shared/components/page.component.ts index d06e5ccc7b..4a5ee06cbc 100644 --- a/ui-ngx/src/app/shared/components/page.component.ts +++ b/ui-ngx/src/app/shared/components/page.component.ts @@ -29,6 +29,8 @@ export abstract class PageComponent implements OnDestroy { loadingSubscription: Subscription; disabledOnLoadFormControls: Array = []; + showMainLoadingBar = true; + protected constructor(protected store: Store) { this.isLoading$ = this.store.pipe(delay(0), select(selectIsLoading), share()); } diff --git a/ui-ngx/src/app/shared/components/snack-bar-component.html b/ui-ngx/src/app/shared/components/snack-bar-component.html index cb39b98f48..ca70f6b476 100644 --- a/ui-ngx/src/app/shared/components/snack-bar-component.html +++ b/ui-ngx/src/app/shared/components/snack-bar-component.html @@ -15,15 +15,30 @@ limitations under the License. --> -
-
- + +
+ + + +
+
+ +
+
diff --git a/ui-ngx/src/app/shared/components/snack-bar-component.scss b/ui-ngx/src/app/shared/components/snack-bar-component.scss index 97531e220e..d86b740fc3 100644 --- a/ui-ngx/src/app/shared/components/snack-bar-component.scss +++ b/ui-ngx/src/app/shared/components/snack-bar-component.scss @@ -71,4 +71,42 @@ background: #008000; } } + + .tb-modern-toast { + display: flex; + flex-direction: column; + z-index: 1; + &-panel { + display: flex; + padding: 4px 4px 4px 12px; + justify-content: center; + align-items: center; + gap: 4px; + border-radius: 4px; + box-shadow: -2px 2px 4px 0px rgba(0,0,0,0.2); + &.info-toast { + background: #e6e6e6; + color: rgba(50, 50, 50, 1); + } + &.warn-toast { + background: #fff3eb; + color: rgba(220, 109, 27, 1); + + } + &.error-toast { + background-color: #fff2f3; + color: rgba(209, 39, 48, 1); + } + &.success-toast { + background: #ebfcec; + color: rgba(0, 128, 0, 1); + } + } + .toast-text { + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 16px; + } + } } diff --git a/ui-ngx/src/app/shared/components/time/timewindow.component.scss b/ui-ngx/src/app/shared/components/time/timewindow.component.scss index 92673a41ad..99f3d8367d 100644 --- a/ui-ngx/src/app/shared/components/time/timewindow.component.scss +++ b/ui-ngx/src/app/shared/components/time/timewindow.component.scss @@ -58,6 +58,7 @@ .mdc-button__label { overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; } } } diff --git a/ui-ngx/src/app/shared/components/toast.directive.ts b/ui-ngx/src/app/shared/components/toast.directive.ts index 6881460f6a..582be5a577 100644 --- a/ui-ngx/src/app/shared/components/toast.directive.ts +++ b/ui-ngx/src/app/shared/components/toast.directive.ts @@ -84,6 +84,7 @@ export class ToastDirective implements AfterViewInit, OnDestroy { if (hideNotification) { const target = hideNotification.target || 'root'; if (this.toastTarget === target) { + this.currentMessage = null; this.ngZone.run(() => { if (this.snackBarRef) { this.snackBarRef.dismiss(); @@ -280,7 +281,7 @@ export type ToastAnimationState = 'default' | 'opened' | 'closing'; }) export class TbSnackBarComponent implements AfterViewInit, OnDestroy { - @ViewChild('actionButton', {static: true}) actionButton: MatButton; + @ViewChild('actionButton') actionButton: MatButton; @HostBinding('class') get panelClass(): string[] { diff --git a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts index d7f4710f8d..a019f086dd 100644 --- a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts +++ b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts @@ -111,6 +111,7 @@ export const setValueActionTranslations = new Map( ); export enum ValueToDataType { + VALUE = 'VALUE', CONSTANT = 'CONSTANT', FUNCTION = 'FUNCTION', NONE = 'NONE' diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts index 7187dc8eaa..569b2bec8a 100644 --- a/ui-ngx/src/app/shared/models/edge.models.ts +++ b/ui-ngx/src/app/shared/models/edge.models.ts @@ -190,3 +190,15 @@ export enum EdgeInstructionsMethod { } export const edgeVersionAttributeKey = 'edgeVersion'; + +export enum EdgeConnectionEvent { + CONNECTED= 'CONNECTED', + DISCONNECTED = 'DISCONNECTED' +} + +export const EdgeConnectionEventTranslationMap = new Map( + [ + [EdgeConnectionEvent.CONNECTED, 'edge.connected'], + [EdgeConnectionEvent.DISCONNECTED, 'edge.disconnected'] + ] +); diff --git a/ui-ngx/src/app/shared/models/limited-api.models.ts b/ui-ngx/src/app/shared/models/limited-api.models.ts index 714441f0b2..d0e2e0cb76 100644 --- a/ui-ngx/src/app/shared/models/limited-api.models.ts +++ b/ui-ngx/src/app/shared/models/limited-api.models.ts @@ -24,7 +24,9 @@ export enum LimitedApi { WS_UPDATES_PER_SESSION = 'WS_UPDATES_PER_SESSION', CASSANDRA_QUERIES = 'CASSANDRA_QUERIES', TRANSPORT_MESSAGES_PER_TENANT = 'TRANSPORT_MESSAGES_PER_TENANT', - TRANSPORT_MESSAGES_PER_DEVICE = 'TRANSPORT_MESSAGES_PER_DEVICE' + TRANSPORT_MESSAGES_PER_DEVICE = 'TRANSPORT_MESSAGES_PER_DEVICE', + EDGE_EVENTS = 'EDGE_EVENTS', + EDGE_EVENTS_PER_EDGE = 'EDGE_EVENTS_PER_EDGE' } export const LimitedApiTranslationMap = new Map( @@ -38,6 +40,8 @@ export const LimitedApiTranslationMap = new Map( [LimitedApi.WS_UPDATES_PER_SESSION, 'api-limit.ws-updates-per-session'], [LimitedApi.CASSANDRA_QUERIES, 'api-limit.cassandra-queries'], [LimitedApi.TRANSPORT_MESSAGES_PER_TENANT, 'api-limit.transport-messages'], - [LimitedApi.TRANSPORT_MESSAGES_PER_DEVICE, 'api-limit.transport-messages-per-device'] + [LimitedApi.TRANSPORT_MESSAGES_PER_DEVICE, 'api-limit.transport-messages-per-device'], + [LimitedApi.EDGE_EVENTS, 'api-limit.edge-events'], + [LimitedApi.EDGE_EVENTS_PER_EDGE, 'api-limit.edge-events-per-edge'], ] ); diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts index 9943bebf3d..ae945b243c 100644 --- a/ui-ngx/src/app/shared/models/notification.models.ts +++ b/ui-ngx/src/app/shared/models/notification.models.ts @@ -474,7 +474,9 @@ export enum NotificationType { API_USAGE_LIMIT = 'API_USAGE_LIMIT', NEW_PLATFORM_VERSION = 'NEW_PLATFORM_VERSION', RULE_NODE = 'RULE_NODE', - RATE_LIMITS = 'RATE_LIMITS' + RATE_LIMITS = 'RATE_LIMITS', + EDGE_CONNECTION = 'EDGE_CONNECTION', + EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE' } export const NotificationTypeIcons = new Map([ @@ -585,6 +587,18 @@ export const NotificationTemplateTypeTranslateMap = new Map([ @@ -612,6 +628,8 @@ export const TriggerTypeTranslationMap = new Map([ [TriggerType.API_USAGE_LIMIT, 'notification.trigger.api-usage-limit'], [TriggerType.NEW_PLATFORM_VERSION, 'notification.trigger.new-platform-version'], [TriggerType.RATE_LIMITS, 'notification.trigger.rate-limits'], + [TriggerType.EDGE_CONNECTION, 'notification.trigger.edge-connection'], + [TriggerType.EDGE_COMMUNICATION_FAILURE, 'notification.trigger.edge-communication-failure'] ]); export interface NotificationUserSettings { diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts index 625d957cff..5f4ca8f7be 100644 --- a/ui-ngx/src/app/shared/models/widget.models.ts +++ b/ui-ngx/src/app/shared/models/widget.models.ts @@ -538,7 +538,8 @@ export enum WidgetActionType { openDashboard = 'openDashboard', custom = 'custom', customPretty = 'customPretty', - mobileAction = 'mobileAction' + mobileAction = 'mobileAction', + openURL = 'openURL' } export enum WidgetMobileActionType { @@ -559,7 +560,8 @@ export const widgetActionTypeTranslationMap = new Map( [ WidgetActionType.openDashboard, 'widget-action.open-dashboard' ], [ WidgetActionType.custom, 'widget-action.custom' ], [ WidgetActionType.customPretty, 'widget-action.custom-pretty' ], - [ WidgetActionType.mobileAction, 'widget-action.mobile-action' ] + [ WidgetActionType.mobileAction, 'widget-action.mobile-action' ], + [ WidgetActionType.openURL, 'widget-action.open-URL' ] ] ); @@ -671,6 +673,7 @@ export interface WidgetAction extends CustomActionDescriptor { setEntityId?: boolean; stateEntityParamName?: string; mobileAction?: WidgetMobileActionDescriptor; + url?: string; } export interface WidgetActionDescriptor extends WidgetAction { diff --git a/ui-ngx/src/assets/help/en_US/notification/edge_communication_failure.md b/ui-ngx/src/assets/help/en_US/notification/edge_communication_failure.md new file mode 100644 index 0000000000..712f2b45e7 --- /dev/null +++ b/ui-ngx/src/assets/help/en_US/notification/edge_communication_failure.md @@ -0,0 +1,57 @@ +#### Edge communication failure notification templatization + +
+
+ +Notification subject and message fields support templatization. +The list of available templatization parameters depends on the template type. +See the available types and parameters below: + +Available template parameters: + +* `edgeId` - the edge id as uuid string; +* `edgeName` - the name of the edge; +* `failureMsg` - the string representation of the failure, occurred on the Edge; + +Parameter names must be wrapped using `${...}`. For example: `${edgeName}`. +You may also modify the value of the parameter with one of the suffixes: + +* `upperCase`, for example - `${edgeName:upperCase}` +* `lowerCase`, for example - `${edgeName:lowerCase}` +* `capitalize`, for example - `${edgeName:capitalize}` + +
+ +##### Examples + +Let's assume the notification about the failing of processing connection to Edge. +The following template: + +```text +Edge '${edgeName}' communication failure occurred +{:copy-code} +``` + +will be transformed to: + +```text +Edge 'DatacenterEdge' communication failure occurred +``` + +
+ +The following template: + +```text +Failure message: '${failureMsg}' +{:copy-code} +``` + +will be transformed to: + +```text +Failure message: 'Failed to process edge connection!' +``` + +
+
diff --git a/ui-ngx/src/assets/help/en_US/notification/edge_connection.md b/ui-ngx/src/assets/help/en_US/notification/edge_connection.md new file mode 100644 index 0000000000..37f0ec7573 --- /dev/null +++ b/ui-ngx/src/assets/help/en_US/notification/edge_connection.md @@ -0,0 +1,44 @@ +#### Edge connection notification templatization + +
+
+ +Notification subject and message fields support templatization. +The list of available templatization parameters depends on the template type. +See the available types and parameters below: + +Available template parameters: + +* `edgeId` - the edge id as uuid string; +* `edgeName` - the name of the edge; +* `eventType` - the string representation of the connectivity status: connected or disconnected; + +Parameter names must be wrapped using `${...}`. For example: `${edgeName}`. +You may also modify the value of the parameter with one of the suffixes: + +* `upperCase`, for example - `${edgeName:upperCase}` +* `lowerCase`, for example - `${edgeName:lowerCase}` +* `capitalize`, for example - `${edgeName:capitalize}` + +
+ +##### Examples + +Let's assume the notification about the connecting Edge into the ThingsBoard. +The following template: + +```text +Edge '${edgeName}' is now ${eventType} +{:copy-code} +``` + +will be transformed to: + +```text +Edge 'DatacenterEdge' is now connected +``` + +
+ +
+
diff --git a/ui-ngx/src/assets/help/en_US/notification/rate_limits.md b/ui-ngx/src/assets/help/en_US/notification/rate_limits.md index 8f6319ad80..d314e681c2 100644 --- a/ui-ngx/src/assets/help/en_US/notification/rate_limits.md +++ b/ui-ngx/src/assets/help/en_US/notification/rate_limits.md @@ -11,7 +11,7 @@ Available template parameters: * `api` - rate-limited API label; one of: 'REST API requests', 'REST API requests per customer', 'transport messages', 'transport messages per device', 'Cassandra queries', 'WS updates per session', 'notification requests', 'notification requests per rule', - 'entity version creation', 'entity version load'; + 'entity version creation', 'entity version load', 'Edge events', 'Edge events per edge'; * `limitLevelEntityType` - entity type of the limit level entity, e.g. 'Tenant', 'Device', 'Notification rule', 'Customer', etc.; * `limitLevelEntityId` - id of the limit level entity; * `limitLevelEntityName` - name of the limit level entity; diff --git a/ui-ngx/src/assets/help/en_US/rulenode/common_node_fields_templatization.md b/ui-ngx/src/assets/help/en_US/rulenode/common_node_fields_templatization.md index 0ccbbd9058..50301746c4 100644 --- a/ui-ngx/src/assets/help/en_US/rulenode/common_node_fields_templatization.md +++ b/ui-ngx/src/assets/help/en_US/rulenode/common_node_fields_templatization.md @@ -1,4 +1,4 @@ Fields templatization feature allows you to process the incoming messages with dynamic configuration by substitution of templates specified in the configuration fields with values from message or message metadata. -For more detailed information, please refer to the ThingsBoard [documentation](https://thingsboard.io/docs/user-guide/templatization/) +For more detailed information, please refer to the ThingsBoard [documentation](${siteBaseUrl}/docs/user-guide/templatization/) diff --git a/ui-ngx/src/assets/help/en_US/rulenode/common_node_script_args.md b/ui-ngx/src/assets/help/en_US/rulenode/common_node_script_args.md index 296e5b735c..d9b5bdb0b7 100644 --- a/ui-ngx/src/assets/help/en_US/rulenode/common_node_script_args.md +++ b/ui-ngx/src/assets/help/en_US/rulenode/common_node_script_args.md @@ -8,4 +8,4 @@ Enable 'debug mode' for your rule node to see the messages that arrive in near real-time. -See Debugging for more information. \ No newline at end of file +See Debugging for more information. diff --git a/ui-ngx/src/assets/help/en_US/rulenode/switch_node_script_fn.md b/ui-ngx/src/assets/help/en_US/rulenode/switch_node_script_fn.md index a31eae72cf..0f6ab96736 100644 --- a/ui-ngx/src/assets/help/en_US/rulenode/switch_node_script_fn.md +++ b/ui-ngx/src/assets/help/en_US/rulenode/switch_node_script_fn.md @@ -15,7 +15,7 @@ JavaScript function computing **an array of Link names** to forward the incoming Should return an array of `string` values presenting **link names** that the Rule Engine should use to further route the incoming Message.
If the result is an empty array - message will not be routed to any Node and will be immediately -acknowledged. +acknowledged.
diff --git a/ui-ngx/src/assets/help/en_US/rulenode/tbel/common_node_script_args.md b/ui-ngx/src/assets/help/en_US/rulenode/tbel/common_node_script_args.md index 296e5b735c..d9b5bdb0b7 100644 --- a/ui-ngx/src/assets/help/en_US/rulenode/tbel/common_node_script_args.md +++ b/ui-ngx/src/assets/help/en_US/rulenode/tbel/common_node_script_args.md @@ -8,4 +8,4 @@ Enable 'debug mode' for your rule node to see the messages that arrive in near real-time. -See Debugging for more information. \ No newline at end of file +See Debugging for more information. diff --git a/ui-ngx/src/assets/help/en_US/rulenode/tbel/switch_node_script_fn.md b/ui-ngx/src/assets/help/en_US/rulenode/tbel/switch_node_script_fn.md index 7fd3b7447b..aed694848e 100644 --- a/ui-ngx/src/assets/help/en_US/rulenode/tbel/switch_node_script_fn.md +++ b/ui-ngx/src/assets/help/en_US/rulenode/tbel/switch_node_script_fn.md @@ -15,7 +15,7 @@ Should return an array of `string` values presenting **link names** that the Rule Engine should use to further route the incoming Message.
If the result is an empty array - message will not be routed to any Node and will be immediately -acknowledged. +acknowledged.
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json index dbe7141f97..5a2a7cbeeb 100644 --- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json +++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json @@ -67,10 +67,10 @@ "next-with-label": "Nächste: {{label}}", "read-more": "Mehr dazu", "hide": "Verstecken", - "done": "Erledigt", - "print": "Drucken", - "restore": "Wiederherstellen", - "confirm": "Bestätigen", + "done": "Erledigt", + "print": "Drucken", + "restore": "Wiederherstellen", + "confirm": "Bestätigen", "more": "Mehr", "less": "Weniger", "skip": "Überspringen", @@ -107,6 +107,23 @@ "base-url-required": "Basis-URL ist erforderlich.", "prohibit-different-url": "Prohibit to use hostname from the client request headers", "prohibit-different-url-hint": "This setting should be enabled for production environments. May cause security issues when disabled", + "device-connectivity": { + "device-connectivity": "Geräte Konnektivität", + "http-s": "HTTP(s)", + "mqtt-s": "MQTT(s)", + "coap-s": "COAP(s)", + "http": "HTTP", + "https": "HTTPs", + "mqtt": "MQTT", + "mqtts": "MQTTs", + "coap": "COAP", + "coaps": "COAPs", + "hint": "Falls Host und Port leer sind, werden die Standardwerte des Protokolls verwendet", + "host": "Host", + "port": "Port", + "port-pattern": "Port muss einen positiven Wert haben", + "port-range": "Port sollte im Bereich 1 und 65535 liegen." + }, "mail-from": "E-Mail von", "mail-from-required": "E-Mail von ist erforderlich.", "smtp-protocol": "SMTP Protokoll", @@ -138,7 +155,16 @@ "mail-template": "E-Mail Vorlage", "test": "E-Mail Nachricht testen", "activation": "Nachricht Benutzerkontoaktivierung", - "account-activated": "Nachricht Benutzerkonto aktiviert" + "account-activated": "Nachricht Benutzerkonto aktiviert", + "account-lockout": "Nachricht zur Kontosperrung", + "reset-password": "Nachricht zum Zurücksetzen des Passworts", + "password-was-reset": "Nachricht für Passwort wurde zurückgesetzt", + "user-activated": "Nachricht für Benutzerkonto wurde aktiviert", + "user-registered": "Nachricht für Benutzer hat sich registriert", + "api-usage-state-enabled": "API-Nutzungsstatus wurde aktiviert", + "api-usage-state-warning": "Warnung zum API-Nutzungsstatus", + "api-usage-state-disabled": "API-Nutzungsstatus wurde deaktiviert", + "two-fa-verification": "2FA-Bestätigungsnachricht" }, "mail-subject": "E-Mail Betreff", "mail-body": "E-Mail Nachricht", @@ -186,17 +212,17 @@ "alarm-status-list": "Alarm Statusliste", "any-status": "Jeder Status", "search-status": { - "ANY": "Jeder", - "ACTIVE": "Aktiv", - "CLEARED": "Gelöscht", - "ACK": "Bestätigt", - "UNACK": "Nicht bestätigt" + "ANY": "Jeder", + "ACTIVE": "Aktiv", + "CLEARED": "Gelöscht", + "ACK": "Bestätigt", + "UNACK": "Nicht bestätigt" }, "display-status": { - "ACTIVE_UNACK": "Nicht bestätigt aktiv", - "ACTIVE_ACK": "Bestätigt aktiv", - "CLEARED_UNACK": "Nicht bestätigt", - "CLEARED_ACK": "Bestätigung gelöscht" + "ACTIVE_UNACK": "Nicht bestätigt aktiv", + "ACTIVE_ACK": "Bestätigt aktiv", + "CLEARED_UNACK": "Nicht bestätigt", + "CLEARED_ACK": "Bestätigung gelöscht" }, "no-alarms-prompt": "Keine Alarme gefunden", "created-time": "Erstellungszeit", diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 4160b50024..c71f33fca7 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -856,7 +856,9 @@ "rest-api-requests-per-customer": "REST API requests per customer", "transport-messages": "Transport messages", "transport-messages-per-device": "Transport messages per device", - "ws-updates-per-session": "WS updates per session" + "ws-updates-per-session": "WS updates per session", + "edge-events": "Edge events", + "edge-events-per-edge": "Edge events per edge" }, "audit-log": { "audit": "Audit", @@ -2037,7 +2039,9 @@ "missing-related-rule-chains-title": "Edge has missing related rule chain(s)", "missing-related-rule-chains-text": "Assigned to edge rule chain(s) use rule nodes that forward message(s) to rule chain(s) that are not assigned to this edge.

List of missing rule chain(s):
{{missingRuleChains}}", "upgrade-instructions": "Upgrade Instructions", - "widget-datasource-error": "This widget supports only EDGE entity datasource" + "widget-datasource-error": "This widget supports only EDGE entity datasource", + "connected": "Connected", + "disconnected": "Disconnected" }, "edge-event": { "type-dashboard": "Dashboard", @@ -3288,6 +3292,8 @@ "device-list-rule-hint": "If the field is empty, the trigger will be applied to all devices", "device-profiles-list-rule-hint": "If the field is empty, the trigger will be applied to all device profiles", "disabled": "Disabled", + "edge-trigger-settings": "Edge trigger settings", + "edge-list-rule-hint": "If the field is empty, the trigger will be applied to all edge instances", "edit-notification-recipients-group": "Edit notification recipients group", "edit-notification-template": "Edit notification template", "edit-rule": "Edit rule", @@ -3432,7 +3438,9 @@ "rule-engine-lifecycle-event": "Rule engine lifecycle event", "rule-node": "Rule node", "new-platform-version": "New platform version", - "rate-limits": "Exceeded rate limits" + "rate-limits": "Exceeded rate limits", + "edge-communication-failure": "Edge communication failure", + "edge-connection": "Edge connection" }, "templates": "Templates", "notification-templates": "Notifications / Templates", @@ -3453,6 +3461,8 @@ "rule-engine-lifecycle-event": "Rule engine lifecycle event", "new-platform-version": "New platform version", "rate-limits": "Exceeded rate limits", + "edge-connection": "Edge connection", + "edge-communication-failure": "Edge communication failure", "trigger": "Trigger", "trigger-required": "Trigger is required" }, @@ -4185,6 +4195,10 @@ "edit-tenant-entity-import-rate-limit-title": "Edit entity version load rate limits", "edit-tenant-notification-request-rate-limit-title": "Edit notification requests rate limits", "edit-tenant-notification-requests-per-rule-rate-limit-title": "Edit notification requests per notification rule rate limits", + "edit-edge-events-rate-limit": "Edit edge events rate limits", + "edit-edge-events-per-edge-rate-limit": "Edit edge events per edge rate limits", + "edge-events-rate-limit": "Edge events", + "edge-events-per-edge-rate-limit": "Edge events per edge", "messages-per": "messages per", "not-set": "Not set", "number-of-messages": "Number of messages", @@ -5022,6 +5036,9 @@ "popover-height": "Popover height", "popover-style": "Popover style", "open-new-browser-tab": "Open in a new browser tab", + "open-URL": "Open URL", + "URL": "URL", + "url-required": "URL is required.", "mobile": { "action-type": "Mobile action type", "select-action-type": "Select mobile action type", @@ -5185,13 +5202,35 @@ "action-button": { "behavior": "Behavior", "on-click": "On click", - "on-click-hint": "Action performed when the button is clicked." + "on-click-hint": "Action triggered when the button is clicked" }, "command-button": { "behavior": "Behavior", "on-click": "On click", "on-click-hint": "Action performed when the button is clicked." }, + "power-button": { + "behavior": "Behavior", + "power-on": "Power 'On'", + "power-on-hint": "Action performed to power ON the component.", + "power-off": "Power 'Off'", + "power-off-hint": "Action performed to power OFF the component.", + "on-label": "On", + "off-label": "Off", + "layout": "Layout", + "layout-default": "Default", + "layout-simplified": "Simplified", + "layout-outlined": "Outlined", + "layout-default-volume": "Default.Volume", + "layout-simplified-volume": "Simplified.Volume", + "layout-outlined-volume": "Outlined.Volume", + "main": "Main", + "background": "Background", + "power-on-colors": "Power 'On' colors", + "power-off-colors": "Power 'Off' colors", + "disabled-colors": "Disabled colors", + "button": "Button" + }, "button": { "layout": "Layout", "outlined": "Outlined", @@ -5214,9 +5253,9 @@ }, "button-state": { "activated-state": "Activated state", - "activated-state-hint": "Condition under which the button is active.", + "activated-state-hint": "Configure condition under which the button is active.", "disabled-state": "Disabled state", - "disabled-state-hint": "Condition under which the button is disabled.", + "disabled-state-hint": "Configure condition under which the button is disabled.", "enabled": "Enabled", "hovered": "Hovered", "pressed": "Pressed", @@ -6303,6 +6342,31 @@ "off-label": "Off label", "switch": "Switch" }, + "slider": { + "behavior": "Behavior", + "initial-value": "Initial value", + "initial-value-hint": "Action to get the initial value of the slider.", + "on-value-change": "On value change", + "on-value-change-hint": "Action triggered when the slider value is changed.", + "layout": "Layout", + "layout-default": "Default", + "layout-extended": "Extended", + "layout-simplified": "Simplified", + "auto-scale": "Auto scale", + "icon": "Icon", + "value": "Value", + "range": "Range", + "min": "min", + "max": "max", + "range-ticks": "Range ticks", + "tick-marks": "Tick marks", + "colors": "Colors", + "main": "Main", + "background": "Background", + "left-icon": "Left icon", + "right-icon": "Right icon", + "slider": "Slider" + }, "value-card": { "layout": "Layout", "layout-square": "Square", @@ -6325,6 +6389,7 @@ "layout": "Layout", "background-overlay": "Value background overlay", "total-volume": "Total volume", + "total-volume-units": "Total volume units", "tank": "Tank", "shape": "Shape", "datasource-units": "Source units", @@ -6526,13 +6591,13 @@ }, "rpc-state": { "initial-state": "Initial state", - "initial-state-hint": "Action to get the initial value of the component.", + "initial-state-hint": "Action to get the initial state (On/Off) of the component.", "disabled-state": "Disabled state", - "disabled-state-hint": "Condition under which the component is disabled.", + "disabled-state-hint": "Configure condition under which the component is disabled.", "turn-on": "Turn 'On'", - "turn-on-hint": "Action performed to turn ON the component.", + "turn-on-hint": "Action triggered when the slider is switched to 'On'", "turn-off": "Turn 'Off'", - "turn-off-hint": "Action performed to turn OFF the component.", + "turn-off-hint": "Action triggered when the slider is switched to 'Off'", "on": "On", "off": "Off", "disabled": "Disabled" @@ -6573,6 +6638,7 @@ "converter-none": "None", "converter-function": "Function", "converter-constant": "Constant", + "converter-value": "Value", "parse-value-function": "Parse value function", "state-when-result-is": "'{{state}}' when result is", "parameters": "Parameters", @@ -6859,6 +6925,7 @@ "ko_KR": "한국어", "lv_LV": "Latviešu", "nl_BE": "Koninkrijk België", + "pl_PL": "Polski", "pt_BR": "Português do Brasil", "ro_RO": "Română", "sl_SI": "Slovenščina", diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json new file mode 100644 index 0000000000..014666017c --- /dev/null +++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json @@ -0,0 +1,6703 @@ +{ + "access":{ + "unauthorized":"Unauthorized", + "unauthorized-access":"Unauthorized Access", + "unauthorized-access-text":"You should sign in to have access to this resource!", + "access-forbidden":"Access Forbidden", + "access-forbidden-text":"You haven't access rights to this location!
Try to sign in with different user if you still wish to gain access to this location.", + "refresh-token-expired":"Session has expired", + "refresh-token-failed":"Unable to refresh session", + "permission-denied":"Permission Denied", + "permission-denied-text":"You don't have permission to perform this operation!" + }, + "account":{ + "account":"Konto", + "notification-settings":"Ustawienia powiadomień" + }, + "action":{ + "activate":"Aktywuj", + "suspend":"Zawieś", + "save":"Zapisz", + "saveAs":"Zapisz jako", + "move":"Przenieś", + "cancel":"Anuluj", + "ok":"OK", + "delete":"Usuń", + "add":"Dodaj", + "yes":"Tak", + "no":"Nie", + "update":"Aktualizuj", + "remove":"Usuń", + "select":"Wybierz", + "search":"Szukaj", + "clear-search":"Wyczyść wyszukiwanie", + "assign":"Przypisz", + "unassign":"Cofnij przypisanie", + "share":"Udostępnij", + "make-private":"Uczyń prywatnym", + "apply":"Zastosuj", + "apply-changes":"Zastosuj zmiany", + "edit-mode":"Tryb edycji", + "enter-edit-mode":"Wejdź w tryb edycji", + "decline-changes":"Odrzuć zmiany", + "decline":"Odrzuć", + "close":"Zamknij", + "back":"Wstecz", + "run":"Uruchom", + "sign-in":"Zaloguj się!", + "edit":"Edytuj", + "view":"Zobacz", + "create":"Utwórz", + "drag":"Przeciągnij", + "refresh":"Odśwież", + "undo":"Cofnij", + "copy":"Kopiuj", + "paste":"Wklej", + "copy-reference":"Kopiuj odniesienie", + "paste-reference":"Wklej odniesienie", + "import":"Importuj", + "export":"Eksportuj", + "share-via":"Udostępnij przez {{provider}}", + "continue":"Kontynuuj", + "discard-changes":"Porzuć zmiany", + "download":"Pobierz", + "next":"Dalej", + "next-with-label":"Następne: {{label}}", + "read-more":"Czytaj więcej", + "hide":"Ukryj", + "done":"Gotowe", + "print":"Drukuj", + "restore":"Przywróć", + "confirm":"Potwierdź", + "more":"Więcej", + "less":"Mniej", + "skip":"Pomiń", + "send":"Wyślij", + "reset":"Resetuj", + "show-more":"Pokaż więcej", + "dont-show-again":"Nie pokazuj ponownie", + "see-documentation":"Zobacz dokumentację", + "clear":"Wyczyść", + "upload":"Prześlij", + "delete-anyway":"Usuń mimo wszystko", + "delete-selected":"Usuń wybrane" + }, + "aggregation":{ + "aggregation":"Agregacja", + "function":"Funkcja agregacji danych", + "limit":"Maksymalna liczba wartości", + "group-interval":"Interwał grupowania", + "min":"Min", + "max":"Maks", + "avg":"Średnia", + "sum":"Suma", + "count":"Liczba", + "none":"Brak" + }, + "admin":{ + "settings":"Ustawienia", + "general":"Ogólne", + "general-settings":"Ustawienia Ogólne", + "home-settings":"Ustawienia Strony Głównej", + "home":"Strona Główna", + "outgoing-mail":"Serwer poczty", + "outgoing-mail-settings":"Ustawienia Serwera Poczty Wychodzącej", + "system-settings":"Ustawienia Systemowe", + "test-mail-sent":"Testowy email został wysłany pomyślnie!", + "base-url":"Podstawowy URL", + "base-url-required":"Podstawowy URL jest wymagany.", + "prohibit-different-url":"Zabroń używania nazwy hosta z nagłówków żądania klienta", + "prohibit-different-url-hint":"Ta opcja powinna być włączona w środowiskach produkcyjnych. Może powodować problemy bezpieczeństwa, gdy jest wyłączona", + "device-connectivity":{ + "device-connectivity":"Łączność urządzenia", + "http-s":"HTTP(s)", + "mqtt-s":"MQTT(s)", + "coap-s":"COAP(s)", + "http":"HTTP", + "https":"HTTPs", + "mqtt":"MQTT", + "mqtts":"MQTTs", + "coap":"COAP", + "coaps":"COAPs", + "hint":"Jeśli pola hosta lub portu są puste, zostanie użyta domyślna wartość protokołu.", + "host":"Host", + "port":"Port", + "port-pattern":"Port musi być dodatnią liczbą całkowitą.", + "port-range":"Port powinien mieścić się w zakresie od 1 do 65535." + }, + "mail-from":"Nadawca", + "mail-from-required":"Nadawca jest wymagany.", + "smtp-protocol":"Protokół SMTP", + "smtp-host":"Host SMTP", + "smtp-host-required":"Host SMTP jest wymagany.", + "smtp-port":"Port SMTP", + "smtp-port-required":"Musisz podać port SMTP.", + "smtp-port-invalid":"To nie wygląda na prawidłowy port SMTP.", + "timeout-msec":"Limit czasu (ms)", + "timeout-required":"Limit czasu jest wymagany.", + "timeout-invalid":"To nie wygląda na prawidłowy limit czasu.", + "enable-tls":"Włącz TLS", + "tls-version":"Wersja TLS", + "enable-proxy":"Włącz proxy", + "proxy-host":"Host proxy", + "proxy-host-required":"Host proxy jest wymagany.", + "proxy-port":"Port proxy", + "proxy-port-required":"Port proxy jest wymagany.", + "proxy-port-range":"Port proxy powinien znajdować się w zakresie od 1 do 65535.", + "proxy-user":"Użytkownik proxy", + "proxy-password":"Hasło proxy", + "change-password":"Zmień hasło", + "send-test-mail":"Wyślij mail testowy", + "sms-provider":"Dostawca SMS", + "sms-provider-settings":"Ustawienia dostawcy SMS", + "sms-provider-type":"Typ dostawcy SMS", + "sms-provider-type-required":"Typ dostawcy SMS jest wymagany.", + "sms-provider-type-aws-sns":"Amazon SNS", + "sms-provider-type-twilio":"Twilio", + "sms-provider-type-smpp":"SMPP", + "aws-access-key-id":"ID klucza dostępu AWS", + "aws-access-key-id-required":"ID klucza dostępu AWS jest wymagane", + "aws-secret-access-key":"Tajny klucz dostępu AWS", + "aws-secret-access-key-required":"Tajny klucz dostępu AWS jest wymagany", + "aws-region":"Region AWS", + "aws-region-required":"Region AWS jest wymagany", + "number-from":"Numer telefonu nadawcy", + "number-from-required":"Numer telefonu nadawcy jest wymagany.", + "number-to":"Numer telefonu odbiorcy", + "number-to-required":"Numer telefonu odbiorcy jest wymagany.", + "phone-number-hint":"Numer telefonu w formacie E.164, np. +19995550123", + "phone-number-hint-twilio":"Numer telefonu w formacie E.164/Numer SID telefonu/SID usługi wiadomości, np. +19995550123/PNXXX/MGXXX", + "phone-number-pattern":"Nieprawidłowy numer telefonu. Powinien być w formacie E.164, np. +19995550123.", + "phone-number-pattern-twilio":"Nieprawidłowy numer telefonu. Powinien być w formacie E.164/Numer SID telefonu/SID usługi wiadomości, np. +19995550123/PNXXX/MGXXX.", + "sms-message":"Wiadomość SMS", + "sms-message-required":"Wiadomość SMS jest wymagana.", + "sms-message-max-length":"Wiadomość SMS nie może być dłuższa niż 1600 znaków", + "twilio-account-sid":"SID konta Twilio", + "twilio-account-sid-required":"SID konta Twilio jest wymagany", + "twilio-account-token":"Token konta Twilio", + "twilio-account-token-required":"Token konta Twilio jest wymagany", + "send-test-sms":"Wyślij testowego SMS-a", + "test-sms-sent":"Testowy SMS został wysłany pomyślnie!", + "security-settings":"Ustawienia bezpieczeństwa", + "password-policy":"Polityka haseł", + "minimum-password-length":"Minimalna długość hasła", + "minimum-password-length-required":"Minimalna długość hasła jest wymagana", + "minimum-password-length-range":"Minimalna długość hasła powinna wynosić od 6 do 50", + "maximum-password-length":"Maksymalna długość hasła", + "maximum-password-length-min":"Maksymalna długość hasła powinna wynosić co najmniej 6", + "maximum-password-length-less-min":"Maksymalna długość hasła powinna być większa niż minimalna długość", + "minimum-uppercase-letters":"Minimalna liczba wielkich liter", + "minimum-uppercase-letters-range":"Minimalna liczba wielkich liter nie może być ujemna", + "minimum-lowercase-letters":"Minimalna liczba małych liter", + "minimum-lowercase-letters-range":"Minimalna liczba małych liter nie może być ujemna", + "minimum-digits":"Minimalna liczba cyfr", + "minimum-digits-range":"Minimalna liczba cyfr nie może być ujemna", + "minimum-special-characters":"Minimalna liczba znaków specjalnych", + "minimum-special-characters-range":"Minimalna liczba znaków specjalnych nie może być ujemna", + "password-expiration-period-days":"Okres ważności hasła w dniach", + "password-expiration-period-days-range":"Okres ważności hasła w dniach nie może być ujemny", + "password-reuse-frequency-days":"Częstotliwość ponownego używania hasła w dniach", + "password-reuse-frequency-days-range":"Częstotliwość ponownego używania hasła w dniach nie może być ujemna", + "allow-whitespace":"Zezwól na białe znaki", + "force-reset-password-if-no-valid":"Wymuś zresetowanie hasła, jeśli nie jest ważne", + "force-reset-password-if-no-valid-hint":"Ostrożnie z włączeniem tej funkcji: będzie wymagać od użytkowników z nieaktualnymi hasłami resetowania ich poprzez email.", + "general-policy":"Ogólna polityka", + "max-failed-login-attempts":"Maksymalna liczba nieudanych prób", + "minimum-max-failed-login-attempts-range":"Maksymalna liczba nieudanych prób logowania nie może być ujemna", + "user-lockout-notification-email":"W przypadku zablokowania konta użytkownika, wyślij powiadomienie na email", + "domain-name":"Nazwa domeny", + "domain-name-unique":"Nazwa domeny i protokół muszą być unikalne.", + "domain-name-max-length":"Nazwa domeny powinna być krótsza niż 256", + "error-verification-url":"Nazwa domeny nie powinna zawierać symboli '/' i ':'. Przykład: thingsboard.io", + "connection-settings":"Ustawienia połączenia", + "oauth2":{ + "access-token-uri":"URI tokenu dostępu", + "access-token-uri-required":"URI tokenu dostępu jest wymagane.", + "activate-user":"Aktywuj użytkownika", + "add-domain":"Dodaj domenę", + "delete-domain":"Usuń domenę", + "add-provider":"Dodaj dostawcę", + "delete-provider":"Usuń dostawcę", + "allow-user-creation":"Zezwalaj na tworzenie użytkowników", + "always-fullscreen":"Zawsze na pełnym ekranie", + "authorization-uri":"URI autoryzacji", + "authorization-uri-required":"URI autoryzacji jest wymagane.", + "client-authentication-method":"Metoda uwierzytelnienia klienta", + "client-id":"ID klienta", + "client-id-required":"ID klienta jest wymagane.", + "client-id-max-length":"ID klienta powinno być krótsze niż 256", + "client-secret":"Sekret klienta", + "client-secret-required":"Sekret klienta jest wymagany.", + "client-secret-max-length":"Sekret klienta powinien być krótszy niż 2049", + "custom-setting":"Niestandardowe ustawienia", + "customer-name-pattern":"Wzorzec nazwy klienta", + "customer-name-pattern-max-length":"Wzorzec nazwy klienta powinien być krótszy niż 256", + "default-dashboard-name":"Domyślna nazwa pulpitu nawigacyjnego", + "default-dashboard-name-max-length":"Domyślna nazwa pulpitu nawigacyjnego powinna być krótsza niż 256", + "delete-domain-text":"Uważaj, po potwierdzeniu domena i wszystkie dane dostawcy będą niedostępne.", + "delete-domain-title":"Czy na pewno chcesz usunąć ustawienia domeny '{{domainName}}'?", + "delete-registration-text":"Uważaj, po potwierdzeniu dane dostawcy będą niedostępne.", + "delete-registration-title":"Czy na pewno chcesz usunąć dostawcę '{{name}}'?", + "email-attribute-key":"Klucz atrybutu email", + "email-attribute-key-required":"Klucz atrybutu email jest wymagany.", + "email-attribute-key-max-length":"Klucz atrybutu email powinien być krótszy niż 32", + "first-name-attribute-key":"Klucz atrybutu imienia", + "first-name-attribute-key-max-length":"Klucz atrybutu imienia powinien być krótszy niż 32", + "general":"Ogólne", + "jwk-set-uri":"URI klucza Web JSON", + "last-name-attribute-key":"Klucz atrybutu nazwiska", + "last-name-attribute-key-max-length":"Klucz atrybutu nazwiska powinien być krótszy niż 32", + "login-button-icon":"Ikona przycisku logowania", + "login-button-label":"Etykieta dostawcy", + "login-button-label-placeholder":"Zaloguj się przez $(Etykieta dostawcy)", + "login-button-label-required":"Etykieta jest wymagana.", + "login-provider":"Dostawca logowania", + "mapper":"Mapper", + "new-domain":"Nowa domena", + "oauth2":"OAuth2", + "password-max-length":"Hasło powinno być krótsze niż 256", + "redirect-uri-template":"Szablon URI przekierowania", + "copy-redirect-uri":"Kopiuj URI przekierowania", + "registration-id":"ID rejestracji", + "registration-id-required":"ID rejestracji jest wymagane.", + "registration-id-unique":"ID rejestracji musi być unikalne dla systemu.", + "scope":"Zakres", + "scope-required":"Zakres jest wymagany.", + "tenant-name-pattern":"Wzorzec nazwy dzierżawcy", + "tenant-name-pattern-required":"Wzorzec nazwy dzierżawcy jest wymagany.", + "tenant-name-pattern-max-length":"Wzorzec nazwy dzierżawcy powinien być krótszy niż 256", + "tenant-name-strategy":"Strategia nazewnictwa dzierżawcy", + "type":"Typ mappera", + "uri-pattern-error":"Nieprawidłowy format URI.", + "url":"URL", + "url-pattern":"Nieprawidłowy format URL.", + "url-required":"URL jest wymagany.", + "url-max-length":"URL powinien być krótszy niż 256", + "user-info-uri":"URI informacji o użytkowniku", + "user-info-uri-required":"URI informacji o użytkowniku jest wymagane.", + "username-max-length":"Nazwa użytkownika powinna być krótsza niż 256", + "user-name-attribute-name":"Klucz atrybutu nazwy użytkownika", + "user-name-attribute-name-required":"Klucz atrybutu nazwy użytkownika jest wymagany", + "protocol":"Protokół", + "domain-schema-http":"HTTP", + "domain-schema-https":"HTTPS", + "domain-schema-mixed":"HTTP+HTTPS", + "enable":"Włącz ustawienia OAuth2", + "domains":"Domeny", + "mobile-apps":"Aplikacje mobilne", + "no-mobile-apps":"Brak skonfigurowanych aplikacji", + "mobile-package":"Pakiet aplikacji", + "mobile-package-placeholder":"Np.: my.example.app", + "mobile-package-hint":"Dla Androida: unikalny ID aplikacji. Dla iOS: identyfikator paczki produktu.", + "mobile-package-unique":"Pakiet aplikacji musi być unikalny.", + "mobile-app-secret":"Sekret aplikacji", + "invalid-mobile-app-secret":"Sekret aplikacji musi zawierać tylko znaki alfanumeryczne i mieć od 16 do 2048 znaków.", + "copy-mobile-app-secret":"Kopiuj sekret aplikacji", + "add-mobile-app":"Dodaj aplikację", + "delete-mobile-app":"Usuń informacje o aplikacji", + "providers":"Dostawcy", + "platform-web":"Web", + "platform-android":"Android", + "platform-ios":"iOS", + "all-platforms":"Wszystkie platformy", + "smtp-provider":"Dostawca SMTP", + "allowed-platforms":"Dozwolone platformy", + "authentication":"Autentykacja", + "basic":"Podstawowy", + "provider":"Dostawca", + "redirect-url":"URI przekierowania", + "domain-name":"Nazwa domeny", + "redirect-url-template":"Szablon URI przekierowania", + "microsoft-tenant-id":"ID dzierżawy (tenant) Microsoft", + "microsoft-tenant-id-required":"ID dzierżawy (tenant) Microsoft jest wymagane", + "token-uri":"URI tokenu", + "token-uri-required":"URI tokenu jest wymagane", + "redirect-uri":"URI przekierowania", + "google-provider":"Google", + "microsoft-provider":"Office 365", + "sendgrid-provider":"Sendgrid", + "custom-provider":"Niestandardowy", + "generate-access-token":"Generuj token dostępu", + "update-access-token":"Aktualizuj token dostępu", + "access-token-status":"Status tokenu dostępu:", + "token-status-generated":"wygenerowany", + "token-status-not-generated":"nie wygenerowany" + }, + "smpp-provider":{ + "smpp-version":"Wersja SMPP", + "smpp-host":"Host SMPP", + "smpp-host-required":"Host SMPP jest wymagany", + "smpp-port":"Port SMPP", + "smpp-port-required":"Port SMPP jest wymagany", + "system-id":"ID systemu", + "system-id-required":"ID systemu jest wymagane", + "password":"Hasło", + "password-required":"Hasło jest wymagane", + "type-settings":"Ustawienia typu", + "source-settings":"Ustawienia źródła", + "destination-settings":"Ustawienia docelowe", + "additional-settings":"Dodatkowe ustawienia", + "system-type":"Typ systemu", + "bind-type":"Typ powiązania", + "service-type":"Typ usługi", + "source-address":"Adres źródłowy", + "source-ton":"TON źródłowy", + "source-npi":"NPI źródłowy", + "destination-ton":"TON docelowy (Typ Numeru)", + "destination-npi":"NPI docelowy (Identyfikacja Planu Numeracji)", + "address-range":"Zakres adresów", + "coding-scheme":"Schemat kodowania", + "bind-type-tx":"Nadajnik", + "bind-type-rx":"Odbiornik", + "bind-type-trx":"Nadawczo-odbiorczy", + "ton-unknown":"Nieznany", + "ton-international":"Międzynarodowy", + "ton-national":"Krajowy", + "ton-network-specific":"Specyficzny dla sieci", + "ton-subscriber-number":"Numer abonenta", + "ton-alphanumeric":"Alfanumeryczny", + "ton-abbreviated":"Skrócony", + "npi-unknown":"0 - Nieznany", + "npi-isdn":"1 - ISDN/plan numeracji telefonicznej (E163/E164)", + "npi-data-numbering-plan":"3 - Plan numeracji danych (X.121)", + "npi-telex-numbering-plan":"4 - Plan numeracji telexu (F.69)", + "npi-land-mobile":"6 - Mobilny lądowy (E.212)", + "npi-national-numbering-plan":"8 - Krajowy plan numeracji", + "npi-private-numbering-plan":"9 - Prywatny plan numeracji", + "npi-ermes-numbering-plan":"10 - Plan numeracji ERMES (ETSI DE/PS 3 01-3)", + "npi-internet":"13 - Internet (IP)", + "npi-wap-client-id":"18 - Identyfikator klienta WAP (do zdefiniowania przez Forum WAP)", + "scheme-smsc":"0 - Domyślny alfabet SMSC (ASCII dla krótkiego i długiego kodu oraz do GSM dla bezpłatnych)", + "scheme-ia5":"1 - IA5 (ASCII dla krótkiego i długiego kodu, łaciński 9 dla bezpłatnych (ISO-8859-9))", + "scheme-octet-unspecified-2":"2 - Oktet nieokreślony (binarny 8-bitowy)", + "scheme-latin-1":"3 - Łaciński 1 (ISO-8859-1)", + "scheme-octet-unspecified-4":"4 - Oktet nieokreślony (binarny 8-bitowy)", + "scheme-jis":"5 - JIS (X 0208-1990)", + "scheme-cyrillic":"6 - Cyrylica (ISO-8859-5)", + "scheme-latin-hebrew":"7 - Łaciński/hebrajski (ISO-8859-8)", + "scheme-ucs-utf":"8 - UCS2/UTF-16 (ISO/IEC-10646)", + "scheme-pictogram-encoding":"9 - Kodowanie piktogramów", + "scheme-music-codes":"10 - Kody muzyczne (ISO-2022-JP)", + "scheme-extended-kanji-jis":"13 - Rozszerzony Kanji JIS (X 0212-1990)", + "scheme-korean-graphic-character-set":"14 - Zestaw koreańskich znaków graficznych (KS C 5601/KS X 1001)" + }, + "queue-select-name":"Wybierz nazwę kolejki", + "queue-name":"Nazwa", + "queue-name-required":"Nazwa kolejki jest wymagana!", + "queues":"Kolejki", + "queue-partitions":"Partycje", + "queue-submit-strategy":"Strategia zgłaszania", + "queue-processing-strategy":"Strategia przetwarzania", + "queue-configuration":"Konfiguracja kolejki", + "repository-settings":"Ustawienia repozytorium", + "repository":"Repozytorium", + "repository-url":"URL repozytorium", + "repository-url-required":"URL repozytorium jest wymagany.", + "default-branch":"Domyślna nazwa gałęzi", + "repository-read-only":"Tylko do odczytu", + "show-merge-commits":"Pokaż commity scalające", + "authentication-settings":"Ustawienia autentykacji", + "auth-method":"Metoda uwierzytelniania", + "auth-method-username-password":"Hasło / token dostępu", + "auth-method-username-password-hint":"Użytkownicy GitHub muszą używać tokenów dostępu z uprawnieniami do zapisu w repozytorium.", + "auth-method-private-key":"Klucz prywatny", + "password-access-token":"Hasło / token dostępu", + "change-password-access-token":"Zmień hasło / token dostępu", + "private-key":"Klucz prywatny", + "drop-private-key-file-or":"Przeciągnij i upuść plik klucza prywatnego lub", + "passphrase":"Hasło", + "enter-passphrase":"Wprowadź hasło", + "change-passphrase":"Zmień hasło", + "check-access":"Sprawdź dostęp", + "check-repository-access-success":"Dostęp do repozytorium pomyślnie zweryfikowany!", + "delete-repository-settings-title":"Czy na pewno chcesz usunąć ustawienia repozytorium?", + "delete-repository-settings-text":"Uważaj, po potwierdzeniu ustawienia repozytorium zostaną usunięte, a funkcja kontroli wersji będzie niedostępna.", + "auto-commit-settings":"Ustawienia automatycznego zatwierdzania", + "auto-commit":"Automatyczne zatwierdzanie", + "auto-commit-entities":"Automatyczne zatwierdzanie encji", + "no-auto-commit-entities-prompt":"Brak skonfigurowanych encji do automatycznego zatwierdzania", + "delete-auto-commit-settings-title":"Czy na pewno chcesz usunąć ustawienia automatycznego zatwierdzania?", + "delete-auto-commit-settings-text":"Uważaj, po potwierdzeniu ustawienia automatycznego zatwierdzania zostaną usunięte, a automatyczne zatwierdzanie zostanie wyłączone dla wszystkich encji.", + "2fa":{ + "2fa":"Dwuetapowa autentykacja", + "available-providers":"Dostępni dostawcy", + "issuer-name":"Nazwa wydawcy", + "issuer-name-required":"Nazwa wydawcy jest wymagana.", + "max-verification-failures-before-user-lockout":"Maksymalna liczba nieudanych weryfikacji przed zablokowaniem użytkownika", + "max-verification-failures-before-user-lockout-pattern":"Maksymalna liczba nieudanych weryfikacji musi być dodatnią liczbą całkowitą.", + "number-of-checking-attempts":"Liczba prób sprawdzenia", + "number-of-checking-attempts-pattern":"Liczba prób sprawdzenia musi być dodatnią liczbą całkowitą.", + "number-of-checking-attempts-required":"Liczba prób sprawdzenia jest wymagana.", + "number-of-codes":"Liczba kodów", + "number-of-codes-pattern":"Liczba kodów musi być dodatnią liczbą całkowitą.", + "number-of-codes-required":"Liczba kodów jest wymagana.", + "provider":"Dostawca", + "retry-verification-code-period":"Okres ponownego próbowania kodu weryfikacyjnego (sek)", + "retry-verification-code-period-pattern":"Minimalny czas okresu to 5 sek", + "retry-verification-code-period-required":"Okres ponownego próbowania kodu weryfikacyjnego jest wymagany.", + "total-allowed-time-for-verification":"Całkowity dozwolony czas na weryfikację (sek)", + "total-allowed-time-for-verification-pattern":"Minimalny całkowity dozwolony czas to 60 sek", + "total-allowed-time-for-verification-required":"Całkowity dozwolony czas jest wymagany.", + "use-system-two-factor-auth-settings":"Użyj systemowych ustawień dwuetapowej autentykacji", + "verification-code-check-rate-limit":"Limit częstotliwości sprawdzania kodu weryfikacyjnego", + "verification-code-lifetime":"Czas życia kodu weryfikacyjnego (sek)", + "verification-code-lifetime-pattern":"Czas życia kodu weryfikacyjnego musi być dodatnią liczbą całkowitą.", + "verification-code-lifetime-required":"Czas życia kodu weryfikacyjnego jest wymagany.", + "verification-message-template":"Szablon wiadomości weryfikacyjnej", + "verification-limitations":"Ograniczenia weryfikacji", + "verification-message-template-pattern":"Wiadomość weryfikacyjna musi zawierać wzór: ${code}", + "verification-message-template-required":"Szablon wiadomości weryfikacyjnej jest wymagany.", + "within-time":"W czasie (sek)", + "within-time-pattern":"Czas musi być dodatnią liczbą całkowitą.", + "within-time-required":"Czas jest wymagany." + }, + "jwt":{ + "security-settings":"Ustawienia bezpieczeństwa JWT", + "issuer-name":"Nazwa wydawcy", + "issuer-name-required":"Nazwa wydawcy jest wymagana.", + "signings-key":"Klucz podpisujący", + "signings-key-hint":"Kodowany Base64 ciąg reprezentujący co najmniej 256 bitów danych.", + "signings-key-required":"Klucz podpisujący jest wymagany.", + "signings-key-min-length":"Klucz podpisujący musi reprezentować co najmniej 256 bitów danych.", + "signings-key-base64":"Klucz podpisujący musi być w formacie base64.", + "expiration-time":"Czas wygaśnięcia tokena (sek)", + "expiration-time-required":"Czas wygaśnięcia tokena jest wymagany.", + "expiration-time-pattern":"Czas wygaśnięcia tokena musi być dodatnią liczbą całkowitą.", + "expiration-time-min":"Minimalny czas to 60 sekund (1 minuta).", + "refresh-expiration-time":"Czas wygaśnięcia tokena odświeżającego (sek)", + "refresh-expiration-time-required":"Czas wygaśnięcia tokena odświeżającego jest wymagany.", + "refresh-expiration-time-pattern":"Czas wygaśnięcia tokena odświeżającego musi być dodatnią liczbą całkowitą.", + "refresh-expiration-time-min":"Minimalny czas to 900 sekund (15 minut).", + "refresh-expiration-time-less-token":"Czas tokena odświeżającego musi być dłuższy niż czas tokena.", + "generate-key":"Wygeneruj klucz", + "info-header":"Wszyscy użytkownicy będą musieli ponownie się zalogować", + "info-message":"Zmiana klucza podpisującego JWT spowoduje unieważnienie wszystkich wydanych tokenów. Wszyscy użytkownicy będą musieli ponownie się zalogować. Dotyczy to również skryptów korzystających z Rest API/Websockets." + }, + "resources":"Zasoby", + "notifications":"Powiadomienia", + "notifications-settings":"Ustawienia powiadomień", + "slack-api-token":"Token API Slack", + "slack":"Slack", + "slack-settings":"Ustawienia Slack" + }, + "alarm":{ + "alarm":"Alarm", + "alarms":"Alarmy", + "all-alarms":"Wszystkie alarmy", + "select-alarm":"Wybierz alarm", + "no-alarms-matching":"Nie znaleziono alarmów pasujących do '{{entity}}'.", + "alarm-required":"Alarm jest wymagany", + "alarm-filter":"Filtr alarmów", + "filter":"Filtr", + "alarm-status":"Status alarmu", + "alarm-status-list":"Lista statusów alarmów", + "any-status":"Dowolny status", + "search-status":{ + "ANY":"Dowolny", + "ACTIVE":"Aktywny", + "CLEARED":"Wyczyszczony", + "ACK":"Potwierdzony", + "UNACK":"Niepotwierdzony" + }, + "display-status":{ + "ACTIVE_UNACK":"Aktywny Niepotwierdzony", + "ACTIVE_ACK":"Aktywny Potwierdzony", + "CLEARED_UNACK":"Wyczyszczony Niepotwierdzony", + "CLEARED_ACK":"Wyczyszczony Potwierdzony" + }, + "no-alarms-prompt":"Nie znaleziono alarmów", + "created-time":"Czas utworzenia", + "type":"Typ", + "severity":"Waga", + "originator":"Inicjator", + "originator-type":"Typ inicjatora", + "details":"Szczegóły", + "originator-label":"Etykieta inicjatora", + "assign":"Przypisz", + "assignments":"Przypisania", + "assignee":"Przypisany", + "assignee-id":"ID przypisanego", + "assignee-first-name":"Imię przypisanego", + "assignee-last-name":"Nazwisko przypisanego", + "assignee-email":"Email przypisanego", + "unassigned":"Nieprzypisany", + "assignee-not-set":"Wszystkie", + "status":"Status", + "alarm-details":"Szczegóły alarmu", + "start-time":"Czas rozpoczęcia", + "assign-time":"Czas przypisania", + "end-time":"Czas zakończenia", + "ack-time":"Czas potwierdzenia", + "clear-time":"Czas wyczyszczenia", + "duration":"Czas trwania", + "alarm-severity-list":"Lista ważności alarmów", + "any-severity":"Dowolna ważność", + "severity-critical":"Krytyczna", + "severity-major":"Poważna", + "severity-minor":"Mniejsza", + "severity-warning":"Ostrzeżenie", + "severity-indeterminate":"Nieokreślona", + "acknowledge":"Potwierdź", + "clear":"Wyczyść", + "delete":"Usuń", + "search":"Szukaj alarmów", + "selected-alarms":"{ count, plural, =1 {1 alarm} other {# alarmów} } wybrano", + "no-data":"Brak danych do wyświetlenia", + "polling-interval":"Interwał odpytywania alarmów (sek)", + "polling-interval-required":"Interwał odpytywania alarmów jest wymagany.", + "min-polling-interval-message":"Dozwolony jest minimalny interwał odpytywania 1 sek.", + "aknowledge-alarms-title":"Potwierdź { count, plural, =1 {1 alarm} other {# alarmów} }", + "aknowledge-alarms-text":"Czy na pewno chcesz potwierdzić { count, plural, =1 {1 alarm} other {# alarmów} }?", + "aknowledge-alarm-title":"Potwierdź alarm", + "aknowledge-alarm-text":"Czy na pewno chcesz potwierdzić alarm?", + "selected-alarms-are-acknowledged":"Wybrane alarmy zostały już potwierdzone", + "clear-alarms-title":"Wyczyść { count, plural, =1 {1 alarm} other {# alarmów} }", + "clear-alarms-text":"Czy na pewno chcesz wyczyścić { count, plural, =1 {1 alarm} other {# alarmów} }?", + "clear-alarm-title":"Wyczyść alarm", + "clear-alarm-text":"Czy na pewno chcesz wyczyścić alarm?", + "delete-alarms-title":"Usuń { count, plural, =1 {1 alarm} other {# alarmów} }", + "delete-alarms-text":"Czy na pewno chcesz usunąć { count, plural, =1 {1 alarm} other {# alarmów} }?", + "selected-alarms-are-cleared":"Wybrane alarmy zostały już wyczyszczone", + "alarm-status-filter":"Filtr statusu alarmów", + "alarm-filter-title":"Filtr alarmów", + "assigned":"Przypisane", + "filter-title":"Filtr", + "max-count-load":"Maksymalna liczba alarmów do załadowania (0 - bez limitu)", + "max-count-load-required":"Maksymalna liczba alarmów do załadowania jest wymagana.", + "max-count-load-error-min":"Minimalna wartość to 0.", + "fetch-size":"Rozmiar pobrania", + "fetch-size-required":"Rozmiar pobrania jest wymagany.", + "fetch-size-error-min":"Minimalna wartość to 10.", + "alarm-type-list":"Lista typów alarmów", + "any-type":"Dowolny typ", + "assigned-to-current-user":"Przypisane do aktualnego użytkownika", + "assigned-to-me":"Przypisane do mnie", + "search-propagated-alarms":"Szukaj propagowanych alarmów", + "comments":"Komentarze do alarmu", + "show-more":"Pokaż więcej", + "additional-info":"Dodatkowe informacje", + "alarm-type":"Typ alarmu", + "enter-alarm-type":"Wpisz typ alarmu", + "no-alarm-types-matching":"Nie znaleziono typów alarmów pasujących do '{{entitySubtype}}'.", + "alarm-type-list-empty":"Nie wybrano typów alarmów." + }, + "alarm-activity":{ + "add":"Dodaj komentarz...", + "alarm-comment":"Komentarz do alarmu", + "comments":"Komentarze", + "delete-alarm-comment":"Czy chcesz usunąć ten komentarz?", + "refresh":"Odśwież", + "oldest-first":"Najstarsze najpierw", + "newest-first":"Najnowsze najpierw", + "activity":"Aktywność", + "export":"Eksportuj do CSV", + "author":"Autor", + "created-date":"Data utworzenia", + "edited-date":"Data edycji", + "text":"Tekst", + "system":"System" + }, + "alias":{ + "add":"Dodaj alias", + "edit":"Edytuj alias", + "name":"Nazwa aliasu", + "name-required":"Nazwa aliasu jest wymagana", + "duplicate-alias":"Alias o tej samej nazwie już istnieje.", + "filter-type-single-entity":"Pojedyncza encja", + "filter-type-entity-list":"Lista encji", + "filter-type-entity-name":"Nazwa encji", + "filter-type-entity-type":"Typ encji", + "filter-type-state-entity":"Encja ze stanu pulpitu nawigacyjnego", + "filter-type-state-entity-description":"Encja pobrana z parametrów stanu pulpitu nawigacyjnego", + "filter-type-asset-type":"Typ aktywa", + "filter-type-asset-type-description":"Aktywa typu '{{assetTypes}}'", + "filter-type-asset-type-and-name-description":"Aktywa typu '{{assetTypes}}' o nazwie rozpoczynającej się od '{{prefix}}'", + "filter-type-device-type":"Typ urządzenia", + "filter-type-device-type-description":"Urządzenia typu '{{deviceTypes}}'", + "filter-type-device-type-and-name-description":"Urządzenia typu '{{deviceTypes}}' o nazwie rozpoczynającej się od '{{prefix}}'", + "filter-type-entity-view-type":"Typ widoku encji", + "filter-type-entity-view-type-description":"Widoki encji typu '{{entityViewTypes}}'", + "filter-type-entity-view-type-and-name-description":"Widoki encji typu '{{entityViewTypes}}' o nazwie rozpoczynającej się od '{{prefix}}'", + "filter-type-edge-type":"Typ krawędzi", + "filter-type-edge-type-description":"Krawędzie typu '{{edgeTypes}}'", + "filter-type-edge-type-and-name-description":"Krawędzie typu '{{edgeTypes}}' o nazwie rozpoczynającej się od '{{prefix}}'", + "filter-type-relations-query":"Zapytanie o relacje", + "filter-type-relations-query-description":"{{entities}} mające relację typu {{relationType}} {{direction}} {{rootEntity}}", + "filter-type-asset-search-query":"Zapytanie wyszukiwania aktywów", + "filter-type-asset-search-query-description":"Aktywa typu {{assetTypes}} mające relację typu {{relationType}} {{direction}} {{rootEntity}}", + "filter-type-device-search-query":"Zapytanie wyszukiwania urządzeń", + "filter-type-device-search-query-description":"Urządzenia typu {{deviceTypes}} mające relację typu {{relationType}} {{direction}} {{rootEntity}}", + "filter-type-entity-view-search-query":"Zapytanie wyszukiwania widoków encji", + "filter-type-entity-view-search-query-description":"Widoki encji typu {{entityViewTypes}} mające relację typu {{relationType}} {{direction}} {{rootEntity}}", + "filter-type-apiUsageState":"Stan użycia API", + "filter-type-edge-search-query":"Zapytanie wyszukiwania krawędzi", + "filter-type-edge-search-query-description":"Krawędzie typu {{edgeTypes}} mające relację typu {{relationType}} {{direction}} {{rootEntity}}", + "entity-filter":"Filtr encji", + "resolve-multiple":"Rozwiąż jako wiele encji", + "filter-type":"Typ filtra", + "filter-type-required":"Typ filtra jest wymagany.", + "entity-filter-no-entity-matched":"Nie znaleziono encji pasujących do określonego filtra.", + "no-entity-filter-specified":"Nie określono filtra encji", + "root-state-entity":"Użyj encji stanu pulpitu nawigacyjnego jako korzenia", + "last-level-relation":"Pobierz tylko relacje ostatniego poziomu", + "root-entity":"Encja główna", + "state-entity-parameter-name":"Nazwa parametru encji stanu", + "default-state-entity":"Domyślna encja stanu", + "default-entity-parameter-name":"Domyślnie", + "max-relation-level":"Maksymalny poziom relacji", + "unlimited-level":"Nieograniczony poziom", + "state-entity":"Encja stanu pulpitu nawigacyjnego", + "all-entities":"Wszystkie encje", + "any-relation":"dowolna" + }, + "asset":{ + "asset":"Aktywa", + "assets":"Aktywa", + "management":"Zarządzanie aktywami", + "view-assets":"Wyświetl aktywa", + "add":"Dodaj aktywa", + "asset-type-max-length":"Typ aktywa powinien być krótszy niż 256", + "assign-to-customer":"Przypisz do klienta", + "assign-asset-to-customer":"Przypisz aktywa do klienta", + "assign-asset-to-customer-text":"Proszę wybrać aktywa do przypisania klientowi", + "no-assets-text":"Nie znaleziono aktywów", + "assign-to-customer-text":"Proszę wybrać klienta do przypisania aktywów", + "public":"Publiczne", + "assignedToCustomer":"Przypisane do klienta", + "make-public":"Upublicznij aktywa", + "make-private":"Prywatyzuj aktywa", + "unassign-from-customer":"Usuń przypisanie od klienta", + "delete":"Usuń aktywa", + "asset-public":"Aktywa są publiczne", + "asset-type":"Typ aktywa", + "asset-type-required":"Typ aktywa jest wymagany.", + "select-asset-type":"Wybierz typ aktywa", + "enter-asset-type":"Wprowadź typ profilu aktywa", + "any-asset":"Dowolne aktywa", + "no-asset-types-matching":"Nie znaleziono typów aktywów pasujących do '{{entitySubtype}}'.", + "asset-type-list-empty":"Nie wybrano typów aktywów.", + "asset-types":"Typy aktywów", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "name-max-length":"Nazwa powinna być krótsza niż 256", + "label-max-length":"Etykieta powinna być krótsza niż 256", + "description":"Opis", + "type":"Typ", + "type-required":"Typ jest wymagany.", + "details":"Szczegóły", + "events":"Wydarzenia", + "add-asset-text":"Dodaj nowe aktywa", + "asset-details":"Szczegóły aktywa", + "assign-assets":"Przypisz aktywa", + "assign-assets-text":"Przypisz { count, plural, =1 {1 aktywa} other {# aktywów} } do klienta", + "assign-asset-to-edge-title":"Przypisz aktywa do krawędzi", + "assign-asset-to-edge-text":"Proszę wybrać aktywa do przypisania do krawędzi", + "delete-assets":"Usuń aktywa", + "unassign-assets":"Usuń przypisanie aktywów", + "unassign-assets-action-title":"Usuń przypisanie { count, plural, =1 {1 aktywa} other {# aktywów} } od klienta", + "assign-new-asset":"Przypisz nowe aktywa", + "delete-asset-title":"Czy na pewno chcesz usunąć aktywa '{{assetName}}'?", + "delete-asset-text":"Ostrożnie, po potwierdzeniu aktywa oraz wszystkie powiązane dane staną się nieodwracalne.", + "delete-assets-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 aktywa} other {# aktywów} }?", + "delete-assets-action-title":"Usuń { count, plural, =1 {1 aktywa} other {# aktywów} }", + "delete-assets-text":"Ostrożnie, po potwierdzeniu wszystkie wybrane aktywa oraz wszystkie powiązane dane staną się nieodwracalne.", + "make-public-asset-title":"Czy na pewno chcesz uczynić aktywa '{{assetName}}' publicznymi?", + "make-public-asset-text":"Po potwierdzeniu aktywa oraz wszystkie jego dane staną się publicznie dostępne.", + "make-private-asset-title":"Czy na pewno chcesz uczynić aktywa '{{assetName}}' prywatnymi?", + "make-private-asset-text":"Po potwierdzeniu aktywa oraz wszystkie jego dane staną się prywatne i niedostępne dla innych.", + "unassign-asset-title":"Czy na pewno chcesz usunąć przypisanie aktywów '{{assetName}}'?", + "unassign-asset-text":"Po potwierdzeniu aktywa zostaną usunięte z przypisania i nie będą dostępne dla klienta.", + "unassign-asset":"Usuń przypisanie aktywów", + "unassign-assets-title":"Czy na pewno chcesz usunąć przypisanie { count, plural, =1 {1 aktywa} other {# aktywów} }?", + "unassign-assets-text":"Po potwierdzeniu wszystkie wybrane aktywa zostaną usunięte z przypisania i nie będą dostępne dla klienta.", + "unassign-assets-from-edge":"Usuń przypisanie aktywów od krawędzi", + "copyId":"Kopiuj ID aktywów", + "idCopiedMessage":"ID aktywów zostało skopiowane do schowka", + "select-asset":"Wybierz aktywa", + "no-assets-matching":"Nie znaleziono aktywów pasujących do '{{entity}}'.", + "asset-required":"Aktywa są wymagane", + "name-starts-with":"Wyrażenie nazwy aktywów", + "help-text":"Użyj '%', zgodnie z potrzebą: '%nazwa_zawiera_aktywa%', '%nazwa_kończy_się_aktywami', 'nazwa_rozpoczyna_się_aktywami'.", + "import":"Importuj aktywa", + "asset-file":"Plik aktywów", + "label":"Etykieta", + "search":"Wyszukaj aktywa", + "assign-asset-to-edge":"Przypisz aktywa do krawędzi", + "unassign-asset-from-edge":"Usuń przypisanie aktywów od krawędzi", + "unassign-asset-from-edge-title":"Czy na pewno chcesz usunąć przypisanie aktywów '{{assetName}}' od krawędzi?", + "unassign-asset-from-edge-text":"Po potwierdzeniu aktywa zostaną usunięte z przypisania od krawędzi i nie będą dostępne dla tej krawędzi.", + "unassign-assets-from-edge-title":"Czy na pewno chcesz usunąć przypisanie { count, plural, =1 {1 aktywa} other {# aktywów} } od krawędzi?", + "unassign-assets-from-edge-text":"Po potwierdzeniu wszystkie wybrane aktywa zostaną usunięte z przypisania od krawędzi i nie będą dostępne dla tej krawędzi.", + "selected-assets":"{ count, plural, =1 {1 aktywo} other {# aktywów} } wybrane" + }, + "attribute":{ + "attributes":"Atrybuty", + "latest-telemetry":"Najnowsza telemetria", + "no-latest-telemetry":"Brak najnowszej telemetrii", + "attributes-scope":"Zakres atrybutów encji", + "scope-telemetry":"Telemetria", + "scope-latest-telemetry":"Najnowsza telemetria", + "scope-client":"Atrybuty klienta", + "scope-server":"Atrybuty serwera", + "scope-shared":"Atrybuty współdzielone", + "add":"Dodaj atrybut", + "key":"Klucz", + "key-max-length":"Klucz powinien być krótszy niż 256", + "last-update-time":"Czas ostatniej aktualizacji", + "key-required":"Klucz atrybutu jest wymagany.", + "value":"Wartość", + "value-required":"Wartość atrybutu jest wymagana.", + "telemetry-key-required":"Klucz telemetrii jest wymagany", + "telemetry-value-required":"Wartość telemetrii jest wymagana", + "delete-attributes-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 atrybut} other {# atrybutów} }?", + "delete-attributes-text":"Ostrożnie, po potwierdzeniu wszystkie wybrane atrybuty zostaną usunięte.", + "delete-attributes":"Usuń atrybuty", + "enter-attribute-value":"Wprowadź wartość atrybutu", + "show-on-widget":"Pokaż na widżecie", + "widget-mode":"Tryb widżetu", + "next-widget":"Następny widżet", + "prev-widget":"Poprzedni widżet", + "add-to-dashboard":"Dodaj do pulpitu nawigacyjnego", + "add-widget-to-dashboard":"Dodaj widżet do pulpitu nawigacyjnego", + "selected-attributes":"{ count, plural, =1 {1 atrybut} other {# atrybutów} } wybrano", + "selected-telemetry":"{ count, plural, =1 {1 jednostka telemetrii} other {# jednostek telemetrii} } wybrano", + "no-attributes-text":"Nie znaleziono atrybutów", + "no-telemetry-text":"Nie znaleziono telemetrii", + "copy-key":"Kopiuj klucz", + "add-telemetry":"Dodaj telemetrię", + "copy-value":"Kopiuj wartość", + "delete-timeseries":{ + "start-time":"Czas rozpoczęcia", + "ends-on":"Kończy się", + "strategy":"Strategia", + "delete-strategy":"Strategia usuwania", + "all-data":"Usuń wszystkie dane", + "all-data-except-latest-value":"Usuń wszystkie dane oprócz najnowszej wartości", + "latest-value":"Usuń najnowszą wartość", + "all-data-for-time-period":"Usuń wszystkie dane za okres czasu", + "rewrite-latest-value":"Zastąp najnowszą wartość" + } + }, + "api-usage":{ + "api-features":"Funkcje API", + "api-usage":"Użycie API", + "alarm":"Alarm", + "alarms-created":"Utworzone alarmy", + "alarms-created-daily-activity":"Dzienna aktywność utworzonych alarmów", + "alarms-created-hourly-activity":"Godzinna aktywność utworzonych alarmów", + "alarms-created-monthly-activity":"Miesięczna aktywność utworzonych alarmów", + "data-points":"Punkty danych", + "data-points-storage-days":"Dni przechowywania punktów danych", + "device-api":"API urządzenia", + "email":"Email", + "email-messages":"Wiadomości e-mail", + "email-messages-daily-activity":"Dzienna aktywność wiadomości e-mail", + "email-messages-monthly-activity":"Miesięczna aktywność wiadomości e-mail", + "exceptions":"Wyjątki", + "executions":"Wykonania", + "scripts":"Skrypty", + "scripts-hourly-activity":"Godzinna aktywność skryptów", + "scripts-daily-activity":"Dzienna aktywność skryptów", + "scripts-monthly-activity":"Miesięczna aktywność skryptów", + "javascript":"JavaScript", + "javascript-executions":"Wykonania JavaScript", + "tbel":"TBEL", + "tbel-executions":"Wykonania TBEL", + "latest-error":"Ostatni błąd", + "messages":"Wiadomości", + "notifications":"Powiadomienia", + "notifications-email-sms":"Powiadomienia (Email/SMS)", + "notifications-hourly-activity":"Godzinna aktywność powiadomień", + "permanent-failures":"Stałe awarie ${entityName}", + "permanent-timeouts":"Stałe przekroczenia czasu ${entityName}", + "processing-failures":"Błędy przetwarzania ${entityName}", + "processing-failures-and-timeouts":"Błędy przetwarzania i przekroczenia czasu", + "processing-timeouts":"Przekroczenia czasu przetwarzania ${entityName}", + "queue-stats":"Statystyki kolejki", + "rule-chain":"Łańcuch reguł", + "rule-engine":"Silnik reguł", + "rule-engine-daily-activity":"Dzienna aktywność silnika reguł", + "rule-engine-executions":"Wykonania silnika reguł", + "rule-engine-hourly-activity":"Godzinna aktywność silnika reguł", + "rule-engine-monthly-activity":"Miesięczna aktywność silnika reguł", + "rule-engine-statistics":"Statystyki silnika reguł", + "rule-node":"Węzeł reguł", + "sms":"SMS", + "sms-messages":"Wiadomości SMS", + "sms-messages-daily-activity":"Dzienna aktywność wiadomości SMS", + "sms-messages-monthly-activity":"Miesięczna aktywność wiadomości SMS", + "successful":"Udane ${entityName}", + "telemetry":"Telemetria", + "telemetry-persistence":"Przechowywanie telemetrii", + "telemetry-persistence-daily-activity":"Dzienna aktywność przechowywania telemetrii", + "telemetry-persistence-hourly-activity":"Godzinna aktywność przechowywania telemetrii", + "telemetry-persistence-monthly-activity":"Miesięczna aktywność przechowywania telemetrii", + "transport":"Transport", + "transport-daily-activity":"Dzienna aktywność transportu", + "transport-data-points":"Punkty danych transportu", + "transport-hourly-activity":"Godzinna aktywność transportu", + "transport-messages":"Wiadomości transportu", + "transport-monthly-activity":"Miesięczna aktywność transportu", + "view-details":"Wyświetl szczegóły", + "view-statistics":"Wyświetl statystyki" + }, + "api-limit":{ + "cassandra-queries":"Zapytania do Cassandry", + "entity-version-creation":"Tworzenie wersji encji", + "entity-version-load":"Ładowanie wersji encji", + "notification-requests":"Żądania powiadomień", + "notification-requests-per-rule":"Żądania powiadomień na regułę", + "rest-api-requests":"Żądania REST API", + "rest-api-requests-per-customer":"Żądania REST API na klienta", + "transport-messages":"Wiadomości transportowe", + "transport-messages-per-device":"Wiadomości transportowe na urządzenie", + "ws-updates-per-session":"Aktualizacje WS na sesję" + }, + "audit-log":{ + "audit":"Audyt", + "audit-logs":"Dzienniki audytu", + "timestamp":"Znacznik czasu", + "entity-type":"Typ encji", + "entity-name":"Nazwa encji", + "user":"Użytkownik", + "type":"Typ", + "status":"Status", + "details":"Szczegóły", + "type-added":"Dodano", + "type-deleted":"Usunięto", + "type-updated":"Zaktualizowano", + "type-attributes-updated":"Zaktualizowano atrybuty", + "type-attributes-deleted":"Usunięto atrybuty", + "type-rpc-call":"Wywołanie RPC", + "type-credentials-updated":"Zaktualizowano dane uwierzytelniające", + "type-assigned-to-customer":"Przypisano do klienta", + "type-unassigned-from-customer":"Usunięto przypisanie od klienta", + "type-assigned-to-edge":"Przypisano do krawędzi", + "type-unassigned-from-edge":"Usunięto przypisanie od krawędzi", + "type-activated":"Aktywowano", + "type-suspended":"Zawieszono", + "type-credentials-read":"Odczytano dane uwierzytelniające", + "type-attributes-read":"Odczytano atrybuty", + "type-relation-add-or-update":"Zaktualizowano relację", + "type-relation-delete":"Usunięto relację", + "type-relations-delete":"Usunięto wszystkie relacje", + "type-alarm-ack":"Potwierdzono", + "type-alarm-clear":"Wyczyszczono", + "type-alarm-assign":"Przypisano", + "type-alarm-unassign":"Usunięto przypisanie", + "type-added-comment":"Dodano komentarz", + "type-updated-comment":"Zaktualizowano komentarz", + "type-deleted-comment":"Usunięto komentarz", + "type-login":"Logowanie", + "type-logout":"Wylogowanie", + "type-lockout":"Blokada", + "status-success":"Sukces", + "status-failure":"Niepowodzenie", + "audit-log-details":"Szczegóły dziennika audytu", + "no-audit-logs-prompt":"Nie znaleziono dzienników", + "action-data":"Dane akcji", + "failure-details":"Szczegóły niepowodzenia", + "search":"Szukaj w dziennikach audytu", + "clear-search":"Wyczyść wyszukiwanie", + "type-assigned-from-tenant":"Przypisano od dzierżawcy", + "type-assigned-to-tenant":"Przypisano do dzierżawcy", + "type-provision-success":"Pomyślne przygotowanie urządzenia", + "type-provision-failure":"Niepowodzenie przygotowania urządzenia", + "type-timeseries-updated":"Zaktualizowano telemetrię", + "type-timeseries-deleted":"Usunięto telemetrię", + "type-sms-sent":"Wysłano SMS" + }, + "confirm-on-exit":{ + "message":"Masz niezapisane zmiany. Czy na pewno chcesz opuścić tę stronę?", + "html-message":"Masz niezapisane zmiany.
Czy na pewno chcesz opuścić tę stronę?", + "title":"Niezapisane zmiany" + }, + "contact":{ + "country":"Kraj", + "city":"Miasto", + "state":"Stan / Prowincja", + "postal-code":"Kod pocztowy", + "postal-code-invalid":"Nieprawidłowy format kodu pocztowego.", + "address":"Adres", + "address2":"Adres 2", + "phone":"Telefon", + "email":"Email", + "no-address":"Brak adresu", + "state-max-length":"Długość stanu powinna być mniejsza niż 256", + "phone-max-length":"Numer telefonu powinien być krótszy niż 256", + "city-max-length":"Nazwa miasta powinna być krótsza niż 256" + }, + "common":{ + "username":"Nazwa użytkownika", + "password":"Hasło", + "enter-username":"Wprowadź nazwę użytkownika", + "enter-password":"Wprowadź hasło", + "enter-search":"Wprowadź wyszukiwanie", + "created-time":"Czas utworzenia", + "loading":"Ładowanie...", + "proceed":"Kontynuuj", + "open-details-page":"Otwórz stronę szczegółów", + "not-found":"Nie znaleziono", + "documentation":"Dokumentacja" + }, + "content-type":{ + "json":"Json", + "text":"Tekst", + "binary":"Binarny (Base64)" + }, + "customer":{ + "customer":"Klient", + "customers":"Klienci", + "management":"Zarządzanie klientami", + "dashboard":"Pulpit nawigacyjny klienta", + "dashboards":"Pulpity nawigacyjne klienta", + "devices":"Urządzenia klienta", + "entity-views":"Widoki encji klienta", + "assets":"Aktywa klienta", + "public-dashboards":"Publiczne pulpity nawigacyjne", + "public-devices":"Publiczne urządzenia", + "public-assets":"Publiczne aktywa", + "public-edges":"Publiczne krawędzie", + "public-entity-views":"Publiczne widoki encji", + "add":"Dodaj klienta", + "delete":"Usuń klienta", + "manage-customer-users":"Zarządzaj użytkownikami klienta", + "manage-customer-devices":"Zarządzaj urządzeniami klienta", + "manage-customer-dashboards":"Zarządzaj pulpitami nawigacyjnymi klienta", + "manage-public-devices":"Zarządzaj publicznymi urządzeniami", + "manage-public-dashboards":"Zarządzaj publicznymi pulpitami nawigacyjnymi", + "manage-customer-assets":"Zarządzaj aktywami klienta", + "manage-public-assets":"Zarządzaj publicznymi aktywami", + "manage-customer-edges":"Zarządzaj krawędziami klienta", + "manage-public-edges":"Zarządzaj publicznymi krawędziami", + "add-customer-text":"Dodaj nowego klienta", + "no-customers-text":"Nie znaleziono klientów", + "customer-details":"Szczegóły klienta", + "delete-customer-title":"Czy na pewno chcesz usunąć klienta '{{customerTitle}}'?", + "delete-customer-text":"Uważaj, po potwierdzeniu klient i wszystkie powiązane dane staną się nieodwracalne.", + "delete-customers-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 klienta} other {# klientów} }?", + "delete-customers-action-title":"Usuń { count, plural, =1 {1 klienta} other {# klientów} }", + "delete-customers-text":"Uważaj, po potwierdzeniu wszyscy wybrani klienci oraz wszystkie powiązane dane staną się nieodwracalne.", + "manage-users":"Zarządzaj użytkownikami", + "manage-assets":"Zarządzaj aktywami", + "manage-devices":"Zarządzaj urządzeniami", + "manage-dashboards":"Zarządzaj pulpitami nawigacyjnymi", + "title":"Tytuł", + "title-required":"Tytuł jest wymagany.", + "title-max-length":"Tytuł powinien być krótszy niż 256", + "description":"Opis", + "details":"Szczegóły", + "events":"Wydarzenia", + "copyId":"Kopiuj ID klienta", + "idCopiedMessage":"ID klienta zostało skopiowane do schowka", + "select-customer":"Wybierz klienta", + "no-customers-matching":"Nie znaleziono klientów pasujących do '{{entity}}'.", + "customer-required":"Klient jest wymagany", + "select-default-customer":"Wybierz domyślnego klienta", + "default-customer":"Domyślny klient", + "default-customer-required":"Domyślny klient jest wymagany do debugowania pulpitu nawigacyjnego na poziomie dzierżawcy", + "search":"Szukaj klientów", + "selected-customers":"{ count, plural, =1 {1 klient} other {# klientów} } wybrano", + "edges":"Instancje krawędzi klienta", + "manage-edges":"Zarządzaj krawędziami" + }, + "date":{ + "last-update-n-ago":"Ostatnia aktualizacja N temu", + "last-update-n-ago-text":"Ostatnia aktualizacja {{ agoText }}", + "custom-date":"Niestandardowa data", + "format":"Format", + "preview":"Podgląd" + }, + "datetime":{ + "date-from":"Data od", + "time-from":"Czas od", + "date-to":"Data do", + "time-to":"Czas do" + }, + "dashboard":{ + "dashboard":"Panel", + "dashboards":"Panele", + "management":"Zarządzanie panelami", + "view-dashboards":"Przeglądaj panele", + "add":"Dodaj panel", + "assign-dashboard-to-customer":"Przypisz panel(y) do klienta", + "assign-dashboard-to-customer-text":"Wybierz panele do przypisania do klienta", + "assign-dashboard-to-edge-title":"Przypisz panel(y) do urządzenia", + "assign-to-customer-text":"Wybierz klienta, do którego przypisane będą panele", + "assign-to-customer":"Przypisz klientowi", + "unassign-from-customer":"Odłącz od klienta", + "make-public":"Udostępnij panel publicznie", + "make-private":"Ustaw panel jako prywatny", + "manage-assigned-customers":"Zarządzaj przypisanymi klientami", + "assigned-customers":"Przypisani klienci", + "assign-to-customers":"Przypisz panele klientom", + "assign-to-customers-text":"Wybierz klientów, do których przypisane będą panele", + "unassign-from-customers":"Odłącz panele od klientów", + "unassign-from-customers-text":"Wybierz klientów, od których odłączone zostaną panele", + "no-dashboards-text":"Nie znaleziono paneli", + "no-widgets":"Brak skonfigurowanych widżetów", + "add-widget":"Dodaj nowy widżet", + "add-widget-button-text":"Dodaj widżet", + "title":"Tytuł", + "image":"Obraz panelu", + "mobile-app-settings":"Ustawienia aplikacji mobilnej", + "mobile-order":"Kolejność panelu w aplikacji mobilnej", + "mobile-hide":"Ukryj panel w aplikacji mobilnej", + "update-image":"Aktualizuj obraz panelu", + "take-screenshot":"Zrób zrzut ekranu", + "select-widget-title":"Wybierz widżet", + "select-widget-value":"{{title}}: wybierz widżet", + "select-widget-subtitle":"Lista dostępnych typów widżetów", + "delete":"Usuń panel", + "title-required":"Tytuł jest wymagany.", + "title-max-length":"Tytuł powinien mieć mniej niż 256 znaków", + "description":"Opis", + "details":"Szczegóły", + "dashboard-details":"Szczegóły panelu", + "add-dashboard-text":"Dodaj nowy panel", + "assign-dashboards":"Przypisz panele", + "assign-new-dashboard":"Przypisz nowy panel", + "assign-dashboards-text":"Przypisz { count, plural, =1 {1 panel} other {# panele} } do klientów", + "unassign-dashboards-action-text":"Odłącz { count, plural, =1 {1 panel} other {# panele} } od klientów", + "delete-dashboards":"Usuń panele", + "unassign-dashboards":"Odłącz panele", + "unassign-dashboards-action-title":"Odłącz { count, plural, =1 {1 panel} other {# panele} } od klienta", + "delete-dashboard-title":"Czy na pewno chcesz usunąć panel '{{dashboardTitle}}'?", + "delete-dashboard-text":"Bądź ostrożny, po potwierdzeniu panel i wszystkie związane z nim dane staną się nieodwracalnie utracone.", + "delete-dashboards-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 panel} other {# panele} }?", + "delete-dashboards-action-title":"Usuń { count, plural, =1 {1 panel} other {# panele} }", + "delete-dashboards-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane panele zostaną usunięte, a wszystkie związane z nimi dane staną się nieodwracalnie utracone.", + "unassign-dashboard-title":"Czy na pewno chcesz odłączyć panel '{{dashboardTitle}}'?", + "unassign-dashboard-text":"Po potwierdzeniu panel zostanie odłączony i nie będzie dostępny dla klienta.", + "unassign-dashboard":"Odłącz panel", + "unassign-dashboards-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 panel} other {# panele} }?", + "unassign-dashboards-text":"Po potwierdzeniu wszystkie wybrane panele zostaną odłączone i nie będą dostępne dla klienta.", + "public-dashboard-title":"Panel jest teraz publiczny", + "public-dashboard-text":"Twój panel {{dashboardTitle}} jest teraz publiczny i dostępny za pomocą następującego publicznego linku:", + "public-dashboard-notice":"Uwaga: Nie zapomnij udostępnić powiązanych urządzeń publicznie, aby uzyskać do nich dostęp.", + "make-private-dashboard-title":"Czy na pewno chcesz uczynić panel '{{dashboardTitle}}' prywatnym?", + "make-private-dashboard-text":"Po potwierdzeniu panel zostanie uczyniony prywatnym i nie będzie dostępny dla innych.", + "make-private-dashboard":"Ustaw panel jako prywatny", + "socialshare-text":"'{{dashboardTitle}}' powered by ThingsBoard", + "socialshare-title":"'{{dashboardTitle}}' powered by ThingsBoard", + "select-dashboard":"Wybierz panel", + "no-dashboards-matching":"Nie znaleziono paneli pasujących do '{{entity}}'", + "dashboard-required":"Panel jest wymagany.", + "select-existing":"Wybierz istniejący panel", + "create-new":"Utwórz nowy panel", + "new-dashboard-title":"Tytuł nowego panelu", + "open-dashboard":"Otwórz panel", + "set-background":"Ustaw tło", + "background-color":"Kolor tła", + "background-image":"Obraz tła", + "background-size-mode":"Tryb rozmiaru tła", + "no-image":"Brak wybranego obrazu", + "empty-image":"Brak obrazu", + "drop-image":"Upuść obraz lub kliknij, aby wybrać plik do przesłania.", + "maximum-upload-file-size":"Maksymalny rozmiar pliku do przesłania: {{ size }}", + "cannot-upload-file":"Nie można przesłać pliku", + "settings":"Ustawienia", + "layout-settings":"Ustawienia układu", + "columns-count":"Liczba kolumn", + "columns-count-required":"Liczba kolumn jest wymagana.", + "min-columns-count-message":"Dozwolona jest tylko minimalna liczba kolumn wynosząca 10.", + "max-columns-count-message":"Dozwolona jest tylko maksymalna liczba kolumn wynosząca 1000.", + "widgets-margins":"Margines między widżetami", + "margin-required":"Wartość marginesu jest wymagana.", + "min-margin-message":"Dozwolona jest tylko wartość minimalna marginesu wynosząca 0.", + "max-margin-message":"Dozwolona jest tylko wartość maksymalna marginesu wynosząca 50.", + "horizontal-margin":"Margines poziomy", + "horizontal-margin-required":"Wartość marginesu poziomego jest wymagana.", + "min-horizontal-margin-message":"Dozwolona jest tylko wartość minimalna marginesu poziomego wynosząca 0.", + "max-horizontal-margin-message":"Dozwolona jest tylko wartość maksymalna marginesu poziomego wynosząca 50.", + "vertical-margin":"Margines pionowy", + "vertical-margin-required":"Wartość marginesu pionowego jest wymagana.", + "min-vertical-margin-message":"Dozwolona jest tylko wartość minimalna marginesu pionowego wynosząca 0.", + "max-vertical-margin-message":"Dozwolona jest tylko wartość maksymalna marginesu pionowego wynosząca 50.", + "apply-outer-margin":"Zastosuj margines do boków układu", + "autofill-height":"Automatycznie wypełnij wysokość układu", + "mobile-layout":"Ustawienia układu na urządzenia mobilne", + "mobile-row-height":"Wysokość rzędu na urządzenia mobilne, px", + "mobile-row-height-required":"Wartość wysokości rzędu na urządzenia mobilne jest wymagana.", + "min-mobile-row-height-message":"Dozwolona jest tylko minimalna wartość wysokości rzędu na urządzenia mobilne wynosząca 5 pikseli.", + "max-mobile-row-height-message":"Dozwolona jest tylko maksymalna wartość wysokości rzędu na urządzenia mobilne wynosząca 200 pikseli.", + "title-settings":"Ustawienia tytułu", + "display-title":"Wyświetl tytuł panelu", + "title-color":"Kolor tytułu", + "toolbar-settings":"Ustawienia paska narzędziowego", + "hide-toolbar":"Ukryj pasek narzędziowy", + "toolbar-always-open":"Zawsze otwarty pasek narzędziowy", + "display-dashboards-selection":"Wyświetl wybór paneli", + "display-entities-selection":"Wyświetl wybór jednostek", + "display-filters":"Wyświetl filtry", + "display-dashboard-timewindow":"Wyświetl okno czasowe panelu", + "display-dashboard-export":"Wyświetl eksport panelu", + "display-update-dashboard-image":"Wyświetl aktualizację obrazu panelu", + "dashboard-logo-settings":"Ustawienia logo panelu", + "display-dashboard-logo":"Wyświetl logo w trybie pełnoekranowym panelu", + "dashboard-logo-image":"Obraz logo panelu", + "advanced-settings":"Zaawansowane ustawienia", + "dashboard-css":"CSS panelu", + "import":"Importuj panel", + "export":"Eksportuj panel", + "export-failed-error":"Nie można wyeksportować panelu: {{error}}", + "create-new-dashboard":"Utwórz nowy panel", + "dashboard-file":"Plik panelu", + "invalid-dashboard-file-error":"Nie można zaimportować panelu: Nieprawidłowa struktura danych panelu.", + "dashboard-import-missing-aliases-title":"Skonfiguruj aliasy używane przez importowany panel", + "create-new-widget":"Utwórz nowy widżet", + "import-widget":"Importuj widżet", + "widget-file":"Plik widżetu", + "invalid-widget-file-error":"Nie można zaimportować widżetu: Nieprawidłowa struktura danych widżetu.", + "widget-import-missing-aliases-title":"Skonfiguruj aliasy używane przez importowany widżet", + "open-toolbar":"Otwórz pasek narzędziowy panelu", + "close-toolbar":"Zamknij pasek narzędziowy panelu", + "configuration-error":"Błąd konfiguracji", + "alias-resolution-error-title":"Błąd konfiguracji aliasów panelu", + "invalid-aliases-config":"Nie można znaleźć żadnych urządzeń pasujących do niektórych filtrów aliasów.
Skontaktuj się z administratorem w celu rozwiązania tego problemu.", + "select-devices":"Wybierz urządzenia", + "assignedToCustomer":"Przypisane do klienta", + "assignedToCustomers":"Przypisane do klientów", + "public":"Publiczne", + "copyId":"Skopiuj identyfikator panelu", + "idCopiedMessage":"Identyfikator panelu został skopiowany do schowka", + "public-link":"Publiczny link", + "copy-public-link":"Skopiuj publiczny link", + "public-link-copied-message":"Publiczny link do panelu został skopiowany do schowka", + "manage-states":"Zarządzaj stanami panelu", + "states":"Stany panelu", + "states-short":"Stany", + "search-states":"Szukaj stanów panelu", + "selected-states":"{ count, plural, =1 {1 stan panelu} other {# stany panelu} } wybranych", + "edit-state":"Edytuj stan panelu", + "delete-state":"Usuń stan panelu", + "add-state":"Dodaj stan panelu", + "no-states-text":"Nie znaleziono stanów", + "state":"Stan panelu", + "state-name":"Nazwa", + "state-name-required":"Wymagana jest nazwa stanu panelu.", + "state-id":"Identyfikator stanu", + "state-id-required":"Wymagane jest Identyfikator stanu panelu.", + "state-id-exists":"Stan panelu o tym samym identyfikatorze już istnieje.", + "is-root-state":"Główny stan", + "delete-state-title":"Usuń stan panelu", + "delete-state-text":"Czy na pewno chcesz usunąć stan panelu o nazwie '{{stateName}}'?", + "show-details":"Pokaż szczegóły", + "hide-details":"Ukryj szczegóły", + "select-state":"Wybierz docelowy stan", + "state-controller":"Kontroler stanu", + "state-controller-default":"statyczny (przestarzały)", + "search":"Szukaj paneli", + "selected-dashboards":"{ count, plural, =1 {1 panel} other {# panele} } wybranych", + "home-dashboard":"Panel główny", + "home-dashboard-hide-toolbar":"Ukryj pasek narzędzi panelu głównego", + "unassign-dashboard-from-edge-text":"Po potwierdzeniu panel zostanie odłączony i nie będzie dostępny dla krawędzi.", + "unassign-dashboards-from-edge-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 panel} other {# panele} }?", + "unassign-dashboards-from-edge-text":"Po potwierdzeniu wszystkie wybrane panele zostaną odłączone i nie będą dostępne dla krawędzi.", + "assign-dashboard-to-edge":"Przypisz panele do krawędzi", + "assign-dashboard-to-edge-text":"Proszę wybrać panele do przypisania do krawędzi", + "non-existent-dashboard-state-error":"Stan panelu o identyfikatorze \"{{ stateId }}\" nie istnieje", + "edit-mode":"Tryb edycji", + "duplicate-state-action":"Zduplikuj stan" + }, + "datakey":{ + "settings":"Ustawienia", + "general":"Ogólne", + "advanced":"Zaawansowane", + "key":"Klucz", + "label":"Etykieta", + "color":"Kolor", + "units":"Symbol specjalny do wyświetlenia obok wartości", + "decimals":"Liczba cyfr po przecinku", + "data-generation-func":"Funkcja generacji danych", + "use-data-post-processing-func":"Użyj funkcji przetwarzania danych po generacji", + "configuration":"Konfiguracja klucza danych", + "timeseries":"Szereg czasowy", + "attributes":"Atrybuty", + "entity-field":"Pole encji", + "alarm":"Pola alarmowe", + "timeseries-required":"Wymagane są serie czasowe encji.", + "timeseries-or-attributes-required":"Wymagane są serie czasowe/cechy encji.", + "alarm-fields-timeseries-or-attributes-required":"Wymagane są pola alarmowe lub serie czasowe/cechy encji.", + "maximum-timeseries-or-attributes":"Maksymalnie { count, plural, =1 {1 seria czasowa/cecha jest dozwolona.} other {# serie czasowe/cechy są dozwolone} }", + "alarm-fields-required":"Wymagane są pola alarmowe.", + "function-types":"Typy funkcji", + "function-type":"Typ funkcji", + "function-types-required":"Wymagane są typy funkcji.", + "data-keys":"Klucze danych", + "data-key":"Klucz danych", + "data-keys-required":"Wymagane są klucze danych.", + "data-key-required":"Wymagany jest klucz danych.", + "alarm-keys":"Klucze danych alarmowych", + "alarm-key":"Klucz danych alarmowych", + "alarm-key-functions":"Funkcje klucza alarmowego", + "alarm-key-function":"Funkcja klucza alarmowego", + "latest-keys":"Ostatnie klucze danych", + "latest-key":"Ostatni klucz danych", + "latest-key-functions":"Funkcje ostatniego klucza", + "latest-key-function":"Funkcja ostatniego klucza", + "timeseries-keys":"Klucze danych szeregów czasowych", + "timeseries-key":"Klucz danych szeregów czasowych", + "timeseries-key-functions":"Funkcje klucza szeregów czasowych", + "timeseries-key-function":"Funkcja klucza szeregów czasowych", + "maximum-function-types":"Maksymalnie { count, plural, =1 {1 typ funkcji jest dozwolony.} other {# typy funkcji są dozwolone} }", + "time-description":"znacznik czasu bieżącej wartości;", + "value-description":"bieżąca wartość;", + "prev-value-description":"wynik poprzedniego wywołania funkcji;", + "time-prev-description":"znacznik czasu poprzedniej wartości;", + "prev-orig-value-description":"oryginalna poprzednia wartość;", + "aggregation":"Agregacja", + "aggregation-type-hint-common":"Ze względów wydajnościowych obliczenia wartości agregowanej są dostępne tylko dla stałych interwałów czasowych, takich jak \"bieżący dzień\", \"bieżący miesiąc\", itp., i nie są dostępne dla interwałów przesuwnych, takich jak 'ostatnie 30 minut' lub 'ostatnie 24 godziny'.", + "aggregation-type-none-hint":"Weź ostatnią wartość.", + "aggregation-type-min-hint":"Znajdź minimalną wartość między punktami danych w wybranym oknie czasowym.", + "aggregation-type-max-hint":"Znajdź maksymalną wartość między punktami danych w wybranym oknie czasowym.", + "aggregation-type-avg-hint":"Oblicz średnią wartość między punktami danych w wybranym oknie czasowym.", + "aggregation-type-sum-hint":"Dodaj wszystkie wartości punktów danych w wybranym oknie czasowym.", + "aggregation-type-count-hint":"Całkowita liczba punktów danych w wybranym oknie czasowym.", + "delta-calculation":"Obliczenia delta", + "enable-delta-calculation":"Włącz obliczenia delta", + "enable-delta-calculation-hint":"Po włączeniu, wartość klucza danych jest obliczana na podstawie wartości agregowanych w wybranym oknie czasowym i okresie porównawczym. Ze względów wydajnościowych obliczenia delta są dostępne tylko dla okien czasowych historycznych, a nie dla wartości czasu rzeczywistego. Na przykład możesz obliczyć różnicę między zużyciem energii wczoraj a zużyciem energii przedwczoraj.", + "delta-calculation-result":"Wynik obliczeń delta", + "delta-calculation-result-previous-value":"Poprzednia wartość", + "delta-calculation-result-delta-absolute":"Delta (bezwzględna)", + "delta-calculation-result-delta-percent":"Delta (procentowa)", + "source":"Źródło", + "latest":"Najnowsze", + "latest-value":"Najnowsza wartość", + "delta":"delta", + "percent":"procent", + "absolute":"bezwzględna" + }, + "datasource":{ + "type":"Typ źródła danych", + "name":"Nazwa", + "label":"Etykieta", + "add-datasource-prompt":"Proszę dodać źródło danych" + }, + "details":{ + "details":"Szczegóły", + "edit-mode":"Tryb edycji", + "edit-json":"Edytuj JSON", + "toggle-edit-mode":"Przełącz tryb edycji" + }, + "device":{ + "device":"Urządzenie", + "device-required":"Urządzenie jest wymagane.", + "devices":"Urządzenia", + "management":"Zarządzanie urządzeniem", + "view-devices":"Zobacz urządzenia", + "device-alias":"Alias urządzenia", + "device-type-max-length":"Typ urządzenia powinien mieć mniej niż 256 znaków", + "aliases":"Aliasy urządzeń", + "no-alias-matching":"'{{alias}}' nie znaleziono.", + "no-aliases-found":"Nie znaleziono aliasów.", + "no-key-matching":"'{{key}}' nie znaleziono.", + "no-keys-found":"Nie znaleziono kluczy.", + "create-new-alias":"Utwórz nowy!", + "create-new-key":"Utwórz nowy!", + "duplicate-alias-error":"Znaleziono duplikat aliasu '{{alias}}'.
Aliasy urządzeń muszą być unikalne w ramach panelu.", + "configure-alias":"Konfiguruj alias '{{alias}}'", + "no-devices-matching":"Nie znaleziono urządzeń pasujących do '{{entity}}'.", + "alias":"Alias", + "alias-required":"Alias urządzenia jest wymagany.", + "remove-alias":"Usuń alias urządzenia", + "add-alias":"Dodaj alias urządzenia", + "name-starts-with":"Wyrażenie nazwy urządzenia", + "help-text":"Użyj '%' według potrzeb: '%device_name_contains%', '%device_name_ends%', 'device_starts_with'.", + "device-list":"Lista urządzeń", + "use-device-name-filter":"Użyj filtra", + "device-list-empty":"Brak wybranych urządzeń.", + "device-name-filter-required":"Filtr nazwy urządzenia jest wymagany.", + "device-name-filter-no-device-matched":"Nie znaleziono urządzeń rozpoczynających się od '{{device}}'.", + "add":"Dodaj urządzenie", + "assign-to-customer":"Przypisz do klienta", + "assign-device-to-customer":"Przypisz urządzenia do klienta", + "assign-device-to-customer-text":"Proszę wybrać urządzenia do przypisania do klienta", + "assign-device-to-edge-title":"Przypisz urządzenia do krawędzi", + "assign-device-to-edge-text":"Proszę wybrać urządzenia do przypisania do krawędzi", + "make-public":"Udostępnij publicznie", + "make-private":"Udostępnij prywatnie", + "no-devices-text":"Nie znaleziono urządzeń", + "assign-to-customer-text":"Proszę wybrać klienta, do którego przypisane będą urządzenia", + "device-details":"Szczegóły urządzenia", + "add-device-text":"Dodaj nowe urządzenie", + "credentials":"Poświadczenia", + "manage-credentials":"Zarządzaj poświadczeniami", + "delete":"Usuń urządzenie", + "assign-devices":"Przypisz urządzenia", + "assign-devices-text":"Przypisz { count, plural, =1 {1 urządzenie} other {# urządzeń} } do klienta", + "delete-devices":"Usuń urządzenia", + "unassign-from-customer":"Odłącz od klienta", + "unassign-devices":"Odłącz urządzenia", + "unassign-devices-action-title":"Odłącz { count, plural, =1 {1 urządzenie} other {# urządzeń} } od klienta", + "unassign-device-from-edge-title":"Czy na pewno chcesz odłączyć urządzenie '{{deviceName}}'?", + "unassign-device-from-edge-text":"Po potwierdzeniu urządzenie zostanie odłączone i nie będzie dostępne przez krawędź.", + "unassign-devices-from-edge":"Odłącz urządzenia od krawędzi", + "assign-new-device":"Przypisz nowe urządzenie", + "make-public-device-title":"Czy na pewno chcesz udostępnić publicznie urządzenie '{{deviceName}}'?", + "make-public-device-text":"Po potwierdzeniu urządzenie i wszystkie jego dane będą dostępne publicznie dla innych.", + "make-private-device-title":"Czy na pewno chcesz udostępnić prywatnie urządzenie '{{deviceName}}'?", + "make-private-device-text":"Po potwierdzeniu urządzenie i wszystkie jego dane będą dostępne prywatnie i nie będą dostępne dla innych.", + "view-credentials":"Zobacz poświadczenia", + "delete-device-title":"Czy na pewno chcesz usunąć urządzenie '{{deviceName}}'?", + "delete-device-text":"Bądź ostrożny, po potwierdzeniu urządzenie i wszystkie powiązane dane staną się nieodwracalnie utracone.", + "delete-devices-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 urządzenie} other {# urządzeń} }?", + "delete-devices-action-title":"Usuń { count, plural, =1 {1 urządzenie} other {# urządzeń} }", + "delete-devices-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane urządzenia zostaną usunięte, a wszystkie powiązane dane staną się nieodwracalnie utracone.", + "unassign-device-title":"Czy na pewno chcesz odłączyć urządzenie '{{deviceName}}'?", + "unassign-device-text":"Po potwierdzeniu urządzenie zostanie odłączone i nie będzie dostępne przez klienta.", + "unassign-device":"Odłącz urządzenie", + "unassign-devices-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 urządzenie} other {# urządzeń} }?", + "unassign-devices-text":"Po potwierdzeniu wszystkie wybrane urządzenia zostaną odłączone i nie będą dostępne przez klienta.", + "device-credentials":"Poświadczenia urządzenia", + "loading-device-credentials":"Ładowanie poświadczeń urządzenia...", + "credentials-type":"Typ poświadczeń", + "access-token":"Token dostępu", + "access-token-required":"Token dostępu jest wymagany.", + "access-token-invalid":"Długość tokenu dostępu musi wynosić od 1 do 32 znaków.", + "certificate-pem-format":"Certyfikat w formacie PEM", + "certificate-pem-format-required":"Certyfikat jest wymagany.", + "copy-access-token":"Skopiuj token dostępu", + "copy-certificate":"Skopiuj certyfikat", + "copy-client-id":"Skopiuj identyfikator klienta", + "copy-user-name":"Skopiuj nazwę użytkownika", + "copy-password":"Skopiuj hasło", + "generate-client-id":"Generuj identyfikator klienta", + "generate-user-name":"Generuj nazwę użytkownika", + "generate-password":"Generuj hasło", + "generate-access-token":"Generuj token dostępu", + "lwm2m-security-config":{ + "identity":"Identyfikator klienta", + "identity-required":"Identyfikator klienta jest wymagany.", + "identity-tooltip":"Identyfikator PSK to dowolny identyfikator PSK o długości do 128 bajtów, zgodny z opisem w standardzie [RFC7925].\nIdentyfikator PSK MUSI być najpierw przekształcony w ciąg znaków, a następnie zakodowany na bajty przy użyciu UTF-8.", + "client-key":"Klucz klienta", + "client-key-required":"Klucz klienta jest wymagany.", + "client-key-tooltip-prk":"Klucz publiczny RPK lub identyfikator muszą być zgodne ze standardem [RFC7250] i zakodowane w formacie Base64!", + "client-key-tooltip-psk":"Klucz PSK musi być zgodny ze standardem [RFC4279] i formatem HexDec: 32, 64, 128 znaków!", + "endpoint":"Nazwa klienta Endpoint", + "endpoint-required":"Nazwa klienta Endpoint jest wymagana.", + "client-public-key":"Klucz publiczny klienta", + "client-public-key-hint":"Jeśli klucz publiczny klienta jest pusty, używane będzie zaufane certyfikat", + "client-public-key-tooltip":"Klucz publiczny X509 musi być w formacie zakodowanym DER X509v3 i obsługiwać wyłącznie algorytm EC, a następnie zakodowany w formacie Base64!", + "mode":"Tryb konfiguracji zabezpieczeń", + "client-tab":"Konfiguracja zabezpieczeń klienta", + "client-certificate":"Certyfikat klienta", + "bootstrap-tab":"Klient rozruchowy", + "bootstrap-server":"Serwer rozruchowy", + "lwm2m-server":"Serwer LwM2M", + "client-publicKey-or-id":"Klucz publiczny klienta lub Identyfikator", + "client-publicKey-or-id-required":"Klucz publiczny klienta lub Identyfikator są wymagane.", + "client-publicKey-or-id-tooltip-psk":"Identyfikator PSK to dowolny identyfikator PSK o długości do 128 bajtów, zgodny z opisem w standardzie [RFC7925].\nIdentyfikator PSK MUSI być najpierw przekształcony w ciąg znaków, a następnie zakodowany na bajty przy użyciu UTF-8.", + "client-publicKey-or-id-tooltip-rpk":"Klucz publiczny RPK lub identyfikator muszą być zgodne ze standardem [RFC7250] i zakodowane w formacie Base64!", + "client-publicKey-or-id-tooltip-x509":"Klucz publiczny X509 musi być w formacie zakodowanym DER X509v3 i obsługiwać wyłącznie algorytm EC, a następnie zakodowany w formacie Base64!", + "client-secret-key":"Tajny klucz klienta", + "client-secret-key-required":"Tajny klucz klienta jest wymagany.", + "client-secret-key-tooltip-psk":"Klucz PSK musi być zgodny ze standardem [RFC4279] i formatem HexDec: 32, 64, 128 znaków!", + "client-secret-key-tooltip-prk":"Tajny klucz RPK musi być w formacie PKCS_8 (kodowanie DER, standard [RFC5958]) i zakodowany w formacie Base64!", + "client-secret-key-tooltip-x509":"Tajny klucz X509 musi być w formacie PKCS_8 (kodowanie DER, standard [RFC5958]) i zakodowany w formacie Base64!" + }, + "client-id":"ID klienta", + "client-id-pattern":"Zawiera nieprawidłowy znak.", + "user-name":"Nazwa użytkownika", + "user-name-required":"Nazwa użytkownika jest wymagana.", + "client-id-or-user-name-necessary":"ID klienta i/lub Nazwa użytkownika są wymagane", + "password":"Hasło", + "secret":"Sekret", + "secret-required":"Sekret jest wymagany.", + "device-type":"Profil urządzenia", + "device-type-required":"Typ urządzenia jest wymagany.", + "select-device-type":"Wybierz typ urządzenia", + "enter-device-type":"Wprowadź profil urządzenia", + "any-device":"Dowolne urządzenie", + "no-device-types-matching":"Nie znaleziono profili urządzeń pasujących do '{{entitySubtype}}'.", + "device-type-list-empty":"Nie wybrano profili urządzeń!", + "device-profile-type-list-empty":"Należy wybrać co najmniej jeden profil urządzenia.", + "device-types":"Profile urządzeń", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "name-max-length":"Nazwa powinna być krótsza niż 256", + "label-max-length":"Etykieta powinna być krótsza niż 256", + "description":"Opis", + "label":"Etykieta", + "events":"Zdarzenia", + "details":"Szczegóły", + "copyId":"Kopiuj ID urządzenia", + "copyAccessToken":"Kopiuj token dostępu", + "copy-mqtt-authentication":"Kopiuj poświadczenia MQTT", + "idCopiedMessage":"ID urządzenia zostało skopiowane do schowka", + "accessTokenCopiedMessage":"Token dostępu do urządzenia został skopiowany do schowka", + "mqtt-authentication-copied-message":"Poświadczenia MQTT urządzenia zostały skopiowane do schowka", + "assignedToCustomer":"Przypisane do klienta", + "unable-delete-device-alias-title":"Nie można usunąć aliasu urządzenia", + "unable-delete-device-alias-text":"Alias urządzenia '{{deviceAlias}}' nie może być usunięty, ponieważ jest używany przez następujące widżety:
{{widgetsList}}", + "is-gateway":"Jest bramą", + "overwrite-activity-time":"Nadpisz czas aktywności podłączonego urządzenia", + "device-filter":"Filtr urządzenia", + "device-filter-title":"Filtr urządzenia", + "filter-title":"Filtr", + "device-state":"Stan urządzenia", + "state":"Stan", + "any":"Dowolny", + "active":"Aktywny", + "inactive":"Nieaktywny", + "public":"Publiczny", + "device-public":"Urządzenie jest publiczne", + "select-device":"Wybierz urządzenie", + "import":"Importuj urządzenie", + "device-file":"Plik urządzenia", + "search":"Wyszukaj urządzenia", + "selected-devices":"{ count, plural, =1 {1 urządzenie} other {# urządzeń} } wybranych", + "device-configuration":"Konfiguracja urządzenia", + "transport-configuration":"Konfiguracja transportu", + "wizard":{ + "device-details":"Szczegóły urządzenia" + }, + "unassign-devices-from-edge-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 urządzenie} other {# urządzeń} }?", + "unassign-devices-from-edge-text":"Po potwierdzeniu wszystkie wybrane urządzenia zostaną odłączone i nie będą dostępne dla krawędzi.", + "time":"Czas", + "connectivity":{ + "check-connectivity":"Sprawdź łączność", + "device-created-check-connectivity":"Urządzenie utworzone. Sprawdźmy łączność!", + "loading-check-connectivity-command":"Ładowanie poleceń sprawdzania łączności...", + "use-following-instructions":"Skorzystaj z poniższych instrukcji, aby wysyłać telemetrię w imieniu urządzenia za pomocą konsoli", + "execute-following-command":"Wykonaj poniższe polecenie", + "install-curl-windows":"Począwszy od systemu Windows 10 b17063, cURL jest dostępny domyślnie", + "install-curl-macos":"Począwszy od Mac OS X 10.2 6C115 (Jaguar), cURL jest dostępny domyślnie", + "install-mqtt-windows":"Użyj instrukcji do pobrania, zainstalowania, skonfigurowania i uruchomienia mosquitto_pub", + "install-coap-client":"Użyj instrukcji do pobrania, zainstalowania, skonfigurowania i uruchomienia klienta coap", + "install-necessary-client-tools":"Zainstaluj niezbędne narzędzia klienta", + "mqtts-x509-command":"Skorzystaj z poniższej dokumentacji, aby połączyć urządzenie za pomocą MQTT z uwierzytelnianiem X509", + "coaps-x509-command":"Skorzystaj z poniższej dokumentacji, aby połączyć urządzenie za pomocą CoAP przez DTLS z uwierzytelnianiem X509", + "snmp-command":"Skorzystaj z poniższej dokumentacji, aby połączyć urządzenie za pomocą SNMP.", + "sparkplug-command":"Skorzystaj z poniższej dokumentacji, aby połączyć urządzenie za pomocą MQTT Sparkplug.", + "lwm2m-command":"Skorzystaj z poniższej dokumentacji, aby połączyć urządzenie za pomocą LWM2M." + } + }, + "asset-profile":{ + "asset-profile":"Profil zasobu", + "asset-profiles":"Profile zasobów", + "all-asset-profiles":"Wszystkie", + "add":"Dodaj profil zasobu", + "edit":"Edytuj profil zasobu", + "asset-profile-details":"Szczegóły profilu zasobu", + "no-asset-profiles-text":"Nie znaleziono profili zasobów", + "search":"Szukaj profili zasobów", + "selected-asset-profiles":"{ count, plural, =1 {1 profil zasobu} other {# profile zasobów} } wybrano", + "no-asset-profiles-matching":"Nie znaleziono profilu zasobu pasującego do '{{entity}}'.", + "asset-profile-required":"Wymagany profil zasobu", + "idCopiedMessage":"Identyfikator profilu zasobu został skopiowany do schowka", + "set-default":"Ustaw jako domyślny profil zasobu", + "delete":"Usuń profil zasobu", + "copyId":"Kopiuj identyfikator profilu zasobu", + "name-max-length":"Nazwa powinna mieć mniej niż 256 znaków", + "new-device-profile-name":"Nazwa profilu zasobu", + "new-device-profile-name-required":"Wymagana jest nazwa profilu zasobu.", + "name":"Nazwa", + "name-required":"Wymagana jest nazwa.", + "image":"Zdjęcie profilu zasobu", + "description":"Opis", + "default":"Domyślny", + "default-rule-chain":"Domyślny łańcuch reguł", + "default-edge-rule-chain":"Domyślny łańcuch reguł na krawędzi", + "default-edge-rule-chain-hint":"Używane na krawędzi jako łańcuch reguł do przetwarzania przychodzących danych dla zasobów tego profilu zasobu", + "mobile-dashboard":"Mobilna konsola", + "mobile-dashboard-hint":"Używane przez aplikację mobilną jako konsola szczegółów zasobu", + "select-queue-hint":"Wybierz z listy rozwijanej.", + "delete-asset-profile-title":"Czy na pewno chcesz usunąć profil zasobu '{{assetProfileName}}'?", + "delete-asset-profile-text":"Bądź ostrożny, po potwierdzeniu profil zasobu i wszystkie związane dane staną się nieodwracalnie utracone.", + "delete-asset-profiles-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 profil zasobu} other {# profile zasobów} }?", + "delete-asset-profiles-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane profile zasobów zostaną usunięte, a wszystkie związane dane staną się nieodwracalnie utracone.", + "set-default-asset-profile-title":"Czy na pewno chcesz ustawić profil zasobu '{{assetProfileName}}' jako domyślny?", + "set-default-asset-profile-text":"Po potwierdzeniu profil zasobu zostanie oznaczony jako domyślny i będzie używany dla nowych zasobów bez określonego profilu.", + "no-asset-profiles-found":"Nie znaleziono profili zasobów.", + "create-new-asset-profile":"Utwórz nowy!", + "create-asset-profile":"Utwórz nowy profil zasobu", + "import":"Importuj profil zasobu", + "export":"Eksportuj profil zasobu", + "export-failed-error":"Nie można wyeksportować profilu zasobu: {{error}}", + "asset-profile-file":"Plik profilu zasobu", + "invalid-asset-profile-file-error":"Nie można zaimportować profilu zasobu: Nieprawidłowa struktura danych profilu zasobu." + }, + "device-profile":{ + "device-profile":"Profil urządzenia", + "device-profiles":"Profile urządzeń", + "all-device-profiles":"Wszystkie", + "add":"Dodaj profil urządzenia", + "edit":"Edytuj profil urządzenia", + "device-profile-details":"Szczegóły profilu urządzenia", + "no-device-profiles-text":"Nie znaleziono profili urządzeń", + "search":"Szukaj profili urządzeń", + "selected-device-profiles":"{ count, plural, =1 {1 profil urządzenia} other {# profile urządzeń} } wybrano", + "no-device-profiles-matching":"Nie znaleziono profilu urządzenia pasującego do '{{entity}}'.", + "device-profile-required":"Wymagany profil urządzenia", + "idCopiedMessage":"Identyfikator profilu urządzenia został skopiowany do schowka", + "set-default":"Ustaw jako domyślny profil urządzenia", + "delete":"Usuń profil urządzenia", + "copyId":"Kopiuj identyfikator profilu urządzenia", + "name-max-length":"Nazwa powinna mieć mniej niż 256 znaków", + "name":"Nazwa", + "name-required":"Wymagana jest nazwa.", + "type":"Typ profilu", + "type-required":"Wymagany jest typ profilu.", + "type-default":"Domyślny", + "image":"Zdjęcie profilu urządzenia", + "transport-type":"Typ transportu", + "transport-type-required":"Wymagany jest typ transportu.", + "transport-type-default":"Domyślny", + "transport-type-default-hint":"Obsługuje podstawowe transporty MQTT, HTTP i CoAP", + "transport-type-mqtt":"MQTT", + "transport-type-mqtt-hint":"Umożliwia zaawansowane ustawienia transportu MQTT", + "transport-type-coap":"CoAP", + "transport-type-coap-hint":"Umożliwia zaawansowane ustawienia transportu CoAP", + "transport-type-lwm2m":"LWM2M", + "transport-type-lwm2m-hint":"Typ transportu LWM2M", + "transport-type-snmp":"SNMP", + "transport-type-snmp-hint":"Określ konfigurację transportu SNMP", + "transport-type-http":"HTTP", + "description":"Opis", + "default":"Domyślny", + "profile-configuration":"Konfiguracja profilu", + "transport-configuration":"Konfiguracja transportu", + "default-rule-chain":"Domyślny łańcuch reguł", + "default-edge-rule-chain":"Domyślny łańcuch reguł na krawędzi", + "default-edge-rule-chain-hint":"Używane na krawędzi jako łańcuch reguł do przetwarzania przychodzących danych dla urządzeń tego profilu urządzenia", + "mobile-dashboard":"Mobilna konsola", + "mobile-dashboard-hint":"Używane przez aplikację mobilną jako konsola szczegółów urządzenia", + "select-queue-hint":"Wybierz z listy rozwijanej.", + "delete-device-profile-title":"Czy na pewno chcesz usunąć profil urządzenia '{{deviceProfileName}}'?", + "delete-device-profile-text":"Bądź ostrożny, po potwierdzeniu profil urządzenia i wszystkie związane dane, w tym powiązane aktualizacje OTA, staną się nieodwracalnie utracone.", + "delete-device-profiles-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 profil urządzenia} other {# profile urządzeń} }?", + "delete-device-profiles-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane profile urządzeń zostaną usunięte, a wszystkie związane dane, w tym powiązane aktualizacje OTA, staną się nieodwracalnie utracone.", + "set-default-device-profile-title":"Czy na pewno chcesz ustawić profil urządzenia '{{deviceProfileName}}' jako domyślny?", + "set-default-device-profile-text":"Po potwierdzeniu profil urządzenia zostanie oznaczony jako domyślny i będzie używany dla nowych urządzeń bez określonego profilu.", + "no-device-profiles-found":"Nie znaleziono profili urządzeń.", + "create-new-device-profile":"Utwórz nowy!", + "mqtt-device-topic-filters":"Filtr tematów urządzenia MQTT", + "mqtt-device-topic-filters-unique":"Filtry tematów urządzenia MQTT muszą być unikalne.", + "mqtt-device-topic-filters-spark-plug":"Węzeł krawędziowy MQTT Sparkplug B (EoN).", + "mqtt-device-topic-filters-spark-plug-hint":"Zezwól na połączenia z węzłami EoN z ładunkiem i formatem tematu Sparkplug B.", + "mqtt-device-topic-filters-spark-plug-attribute-metric-names":"Metryki SparkPlug do przechowywania jako atrybuty.", + "mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint":"Nazwy metryk SparkPlug, które będą przechowywane jako atrybuty urządzenia. Wszystkie inne metryki będą przechowywane jako telemetria urządzenia.", + "mqtt-device-payload-type":"Typ ładunka urządzenia MQTT", + "mqtt-device-payload-type-json":"JSON", + "mqtt-device-payload-type-proto":"Protobuf", + "mqtt-enable-compatibility-with-json-payload-format":"Włącz zgodność z innymi formatami ładunków.", + "mqtt-enable-compatibility-with-json-payload-format-hint":"Gdy jest włączona, platforma będzie domyślnie używać formatu ładunku Protobuf. Jeśli parsowanie się nie powiedzie, platforma spróbuje użyć formatu ładunku JSON. Przydatne dla wstecznej kompatybilności podczas aktualizacji oprogramowania układowego. Na przykład początkowa wersja oprogramowania używa Json, podczas gdy nowa wersja używa Protobuf. Podczas procesu aktualizacji oprogramowania dla floty urządzeń konieczne jest jednoczesne obsługiwanie zarówno Protobuf, jak i JSON. Tryb zgodności wprowadza niewielki spadek wydajności, więc zaleca się wyłączenie tego trybu, gdy wszystkie urządzenia zostaną zaktualizowane.", + "mqtt-use-json-format-for-default-downlink-topics":"Użyj formatu Json dla domyślnych tematów zwrotnych", + "mqtt-use-json-format-for-default-downlink-topics-hint":"Gdy jest włączone, platforma będzie używać formatu ładunku Json do przesyłania atrybutów i RPC za pomocą następujących tematów: v1/devices/me/attributes/response/$request_id, v1/devices/me/attributes, v1/devices/me/rpc/request/$request_id, v1/devices/me/rpc/response/$request_id. Ta ustawienie nie wpływa na subskrypcje atrybutów i rpc wysyłane za pomocą nowych (v2) tematów: v2/a/res/$request_id, v2/a, v2/r/req/$request_id, v2/r/res/$request_id. Gdzie $request_id to identyfikator żądania.", + "mqtt-send-ack-on-validation-exception":"Wyślij PUBACK w przypadku niepowodzenia walidacji komunikatu PUBLISH", + "mqtt-send-ack-on-validation-exception-hint":"Domyślnie platforma zakończy sesję MQTT w przypadku niepowodzenia walidacji komunikatu. Gdy jest włączone, platforma wyśle potwierdzenie publikacji zamiast zakończenia sesji.", + "snmp-add-mapping":"Dodaj mapowanie SNMP", + "snmp-mapping-not-configured":"Nie skonfigurowano mapowania OID na szeregi czasowe/telemetrię", + "snmp-timseries-or-attribute-name":"Nazwa szeregów czasowych/cechy do mapowania", + "snmp-timseries-or-attribute-type":"Typ szeregów czasowych/cechy do mapowania", + "snmp-method-pdu-type-get-request":"GetRequest", + "snmp-method-pdu-type-get-next-request":"GetNextRequest", + "snmp-oid":"OID", + "transport-device-payload-type-json":"JSON", + "transport-device-payload-type-proto":"Protobuf", + "mqtt-payload-type-required":"Wymagany jest typ ładunka.", + "coap-device-type":"Typ urządzenia CoAP", + "coap-device-payload-type":"Typ ładunka urządzenia CoAP", + "coap-device-type-required":"Wymagany jest typ urządzenia CoAP.", + "coap-device-type-default":"Domyślny", + "coap-device-type-efento":"Efento NB-IoT", + "support-level-wildcards":"Obsługiwane są pojedyncze [+] i wielopoziomowe [#] znaki wieloznaczne.", + "telemetry-topic-filter":"Filtr tematu telemetrii", + "telemetry-topic-filter-required":"Wymagany jest filtr tematu telemetrii.", + "attributes-topic-filter":"Filtr tematu publikacji atrybutów", + "attributes-subscribe-topic-filter":"Filtr tematu subskrypcji atrybutów", + "attributes-topic-filter-required":"Wymagany jest filtr tematu publikacji atrybutów.", + "attributes-subscribe-topic-filter-required":"Wymagany jest filtr tematu subskrypcji atrybutów", + "telemetry-proto-schema":"Schemat protokołu telemetrii", + "telemetry-proto-schema-required":"Wymagany jest schemat protokołu telemetrii.", + "attributes-proto-schema":"Schemat protokołu atrybutów", + "attributes-proto-schema-required":"Wymagany jest schemat protokołu atrybutów.", + "rpc-response-proto-schema":"Schemat protokołu odpowiedzi RPC", + "rpc-response-proto-schema-required":"Wymagany jest schemat protokołu odpowiedzi RPC.", + "rpc-response-topic-filter":"Filtr tematu odpowiedzi RPC", + "rpc-response-topic-filter-required":"Wymagany jest filtr tematu odpowiedzi RPC.", + "rpc-request-proto-schema":"Schemat protokołu żądania RPC", + "rpc-request-proto-schema-required":"Wymagany jest schemat protokołu żądania RPC.", + "rpc-request-proto-schema-hint":"Wiadomość żądania RPC powinna zawsze zawierać pola: string method = 1; int32 requestId = 2; oraz params = 3 dowolnego typu danych.", + "not-valid-pattern-topic-filter":"Nieprawidłowy filtr tematu wzorca", + "not-valid-single-character":"Nieprawidłowe użycie znaku wieloznacznego jednego poziomu", + "not-valid-multi-character":"Nieprawidłowe użycie znaku wieloznacznego wielu poziomów", + "single-level-wildcards-hint":"[+] nadaje się do dowolnego poziomu filtra tematu. Na przykład: v1/devices/+/telemetry lub +/devices/+/attributes.", + "multi-level-wildcards-hint":"[#] może zastąpić sam filtr tematu i musi być ostatnim symbolem tematu. Na przykład: # lub v1/devices/me/#.", + "alarm-rules":"Zasady alarmowe", + "alarm-rules-with-count":"Zasady alarmowe ({{count}})", + "no-alarm-rules":"Brak skonfigurowanych zasad alarmowych", + "add-alarm-rule":"Dodaj zasadę alarmową", + "edit-alarm-rule":"Edytuj zasadę alarmową", + "alarm-type":"Typ alarmu", + "alarm-type-required":"Wymagany jest typ alarmu.", + "alarm-type-unique":"Typ alarmu musi być unikalny w ramach zasad alarmowych profilu urządzenia.", + "alarm-type-max-length":"Typ alarmu powinien być krótszy niż 256", + "create-alarm-pattern":"Utwórz alarm {{alarmType}}", + "create-alarm-rules":"Utwórz zasady alarmowe", + "no-create-alarm-rules":"Brak skonfigurowanych warunków utworzenia", + "add-create-alarm-rule-prompt":"Proszę dodać warunek utworzenia alarmu", + "clear-alarm-rule":"Wyczyść zasadę alarmową", + "no-clear-alarm-rule":"Brak skonfigurowanego warunku wyczyszczenia", + "add-create-alarm-rule":"Dodaj warunek utworzenia alarmu", + "add-clear-alarm-rule":"Dodaj warunek wyczyszczenia", + "select-alarm-severity":"Wybierz stopień pilności alarmu", + "alarm-severity-required":"Wymagany jest stopień pilności alarmu.", + "condition-duration":"Czas trwania warunku", + "condition-duration-value":"Wartość czasu trwania", + "condition-duration-time-unit":"Jednostka czasu", + "condition-duration-value-range":"Wartość czasu trwania powinna zawierać się w zakresie od 1 do 2147483647.", + "condition-duration-value-pattern":"Wartość czasu trwania powinna być liczbą całkowitą.", + "condition-duration-value-required":"Wymagana jest wartość czasu trwania.", + "condition-duration-time-unit-required":"Wymagana jest jednostka czasu.", + "advanced-settings":"Zaawansowane ustawienia", + "alarm-rule-additional-info":"Dodatkowe informacje", + "edit-alarm-rule-additional-info":"Edytuj dodatkowe informacje", + "alarm-rule-additional-info-placeholder":"Proszę podać swoje uwagi i dostosowania tutaj, aby wyświetlić je w szczegółach alarmu w sekcji Dodatkowe informacje", + "alarm-rule-additional-info-hint":"Wskazówka: użyj ${kluczNazwy} do zastąpienia wartości kluczy atrybutu lub telemetrii używanych w warunku zasady alarmowej.", + "alarm-rule-mobile-dashboard":"Panel nawigacyjny na urządzenia przenośne", + "alarm-rule-mobile-dashboard-hint":"Używane przez aplikację mobilną jako panel nawigacyjny szczegółów alarmu", + "alarm-rule-no-mobile-dashboard":"Nie wybrano panelu nawigacyjnego", + "propagate-alarm":"Rozprzestrzeniaj alarm do powiązanych jednostek", + "alarm-rule-relation-types-list":"Typy relacji do rozprzestrzeniania", + "alarm-rule-relation-types-list-hint":"Jeśli nie zostaną wybrane typy relacji do rozprzestrzeniania, alarmy będą rozprzestrzeniane bez filtrowania według typu relacji.", + "propagate-alarm-to-owner":"Rozprzestrzeniaj alarm do właściciela jednostki (Klienta lub Najemcy)", + "propagate-alarm-to-tenant":"Rozprzestrzeniaj alarm do Najemcy", + "alarm-rule-condition":"Warunek zasady alarmowej", + "enter-alarm-rule-condition-prompt":"Proszę dodać warunek zasady alarmowej", + "edit-alarm-rule-condition":"Edytuj warunek zasady alarmowej", + "device-provisioning":"Proces przydzielania urządzenia", + "provision-strategy":"Strategia przydzielania", + "provision-strategy-required":"Wymagana jest strategia przydzielania.", + "provision-strategy-disabled":"Wyłączone", + "provision-strategy-created-new":"Zezwól na tworzenie nowych urządzeń", + "provision-strategy-check-pre-provisioned":"Sprawdź wcześniej przydzielone urządzenia", + "provision-device-key":"Klucz przydzielania urządzenia", + "provision-device-key-required":"Wymagany jest klucz przydzielania urządzenia.", + "copy-provision-key":"Kopiuj klucz przydzielania", + "provision-key-copied-message":"Klucz przydzielania został skopiowany do schowka", + "provision-device-secret":"Sekret przydzielania urządzenia", + "provision-device-secret-required":"Wymagany jest sekret przydzielania urządzenia.", + "copy-provision-secret":"Kopiuj sekret przydzielania", + "provision-secret-copied-message":"Sekret przydzielania został skopiowany do schowka", + "provision-strategy-x509":{ + "certificate-chain":"Łańcuch certyfikatów X509", + "certificate-chain-hint":"Strategia certyfikatów X.509 jest używana do przydzielania urządzeń za pomocą certyfikatów klientów w dwukierunkowej komunikacji TLS.", + "allow-create-new-devices":"Utwórz nowe urządzenia", + "allow-create-new-devices-hint":"Jeśli zaznaczone, nowe urządzenia zostaną utworzone, a certyfikat klienta będzie używany jako dane uwierzytelniające urządzenia.", + "certificate-value":"Certyfikat w formacie PEM", + "certificate-value-required":"Wymagany jest certyfikat w formacie PEM", + "cn-regex-variable":"Zmienna wyrażenia regularnego CN", + "cn-regex-variable-required":"Wymagana jest zmienna wyrażenia regularnego CN", + "cn-regex-variable-hint":"Wymagane do pobrania nazwy urządzenia z wspólnego nazewnictwa certyfikatu X509 urządzenia." + }, + "condition":"Warunek", + "condition-type":"Typ warunku", + "condition-type-simple":"Prosty", + "condition-type-duration":"Czas trwania", + "condition-during":"Podczas {{during}}", + "condition-during-dynamic":"Podczas \"{{attribute}}\" ({{during}})", + "condition-type-repeating":"Powtarzający się", + "condition-type-required":"Wymagany jest typ warunku.", + "condition-repeating-value":"Liczba zdarzeń", + "condition-repeating-value-range":"Liczba zdarzeń powinna mieścić się w zakresie od 1 do 2147483647.", + "condition-repeating-value-pattern":"Liczba zdarzeń powinna być liczbą całkowitą.", + "condition-repeating-value-required":"Wymagana jest liczba zdarzeń.", + "condition-repeat-times":"Powtarza się { count, plural, =1 {1 raz} other {# razy} }", + "condition-repeat-times-dynamic":"Powtarza się \"{attribute}\" ({ count, plural, =1 {1 raz} other {# razy} })", + "schedule-type":"Typ harmonogramu", + "schedule-type-required":"Wymagany jest typ harmonogramu.", + "schedule":"Harmonogram", + "edit-schedule":"Edytuj harmonogram alarmu", + "schedule-any-time":"Aktywny przez cały czas", + "schedule-specific-time":"Aktywny o określonej godzinie", + "schedule-custom":"Niestandardowy", + "schedule-day":{ + "monday":"Poniedziałek", + "tuesday":"Wtorek", + "wednesday":"Środa", + "thursday":"Czwartek", + "friday":"Piątek", + "saturday":"Sobota", + "sunday":"Niedziela" + }, + "schedule-days":"Dni", + "schedule-time":"Czas", + "schedule-time-from":"Od", + "schedule-time-to":"Do", + "schedule-days-of-week-required":"Należy wybrać przynajmniej jeden dzień tygodnia.", + "create-device-profile":"Utwórz nowy profil urządzenia", + "import":"Importuj profil urządzenia", + "export":"Eksportuj profil urządzenia", + "export-failed-error":"Nie można wyeksportować profilu urządzenia: {{error}}", + "device-profile-file":"Plik profilu urządzenia", + "invalid-device-profile-file-error":"Nie można zaimportować profilu urządzenia: Nieprawidłowa struktura danych profilu urządzenia.", + "power-saving-mode":"Tryb oszczędzania energii", + "power-saving-mode-type":{ + "default":"Użyj trybu oszczędzania energii profilu urządzenia", + "psm":"Tryb oszczędzania energii (PSM)", + "drx":"Przerwane odbieranie (DRX)", + "edrx":"Rozszerzone przerwane odbieranie (eDRX)" + }, + "edrx-cycle":"Cykl eDRX", + "edrx-cycle-required":"Cykl eDRX jest wymagany.", + "edrx-cycle-pattern":"Cykl eDRX musi być liczbą całkowitą dodatnią.", + "edrx-cycle-min":"Minimalna liczba cykli eDRX to {{ min }} sekundy.", + "paging-transmission-window":"Okno transmisji strony", + "paging-transmission-window-required":"Okno transmisji strony jest wymagane.", + "paging-transmission-window-pattern":"Okno transmisji strony musi być liczbą całkowitą dodatnią.", + "paging-transmission-window-min":"Minimalna liczba okna transmisji strony to {{ min }} sekundy.", + "psm-activity-timer":"Licznik aktywności PSM", + "psm-activity-timer-required":"Licznik aktywności PSM jest wymagany.", + "psm-activity-timer-pattern":"Licznik aktywności PSM musi być liczbą całkowitą dodatnią.", + "psm-activity-timer-min":"Minimalna liczba licznika aktywności PSM to {{ min }} sekundy.", + "lwm2m":{ + "object-list":"Lista obiektów", + "object-list-empty":"Brak wybranych obiektów.", + "no-objects-found":"Nie znaleziono obiektów.", + "no-objects-matching":"Nie znaleziono obiektów pasujących do '{{object}}'.", + "model-tab":"Model LWM2M", + "add-new-instances":"Dodaj nowe instancje", + "instances-list":"Lista instancji", + "instances-list-required":"Lista instancji jest wymagana.", + "instance-id-pattern":"Identyfikator instancji musi być liczbą całkowitą dodatnią.", + "instance-id-max":"Maksymalna wartość identyfikatora instancji to {{max}}.", + "instance":"Instancja", + "resource-label":"#ID Nazwa zasobu", + "observe-label":"Obserwuj", + "attribute-label":"Atrybut", + "telemetry-label":"Telemetria", + "edit-observe-select":"Aby edytować obserwację, wybierz telemetrię lub atrybut", + "edit-attributes-select":"Aby edytować atrybuty, wybierz telemetrię lub atrybut", + "no-attributes-set":"Brak ustawionych atrybutów", + "key-name":"Nazwa klucza", + "key-name-required":"Nazwa klucza jest wymagana", + "attribute-name":"Nazwa atrybutu", + "attribute-name-required":"Nazwa atrybutu jest wymagana.", + "attribute-value":"Wartość atrybutu", + "attribute-value-required":"Wartość atrybutu jest wymagana.", + "attribute-value-pattern":"Wartość atrybutu musi być liczbą całkowitą dodatnią.", + "edit-attributes":"Edytuj atrybuty: {{ name }}", + "view-attributes":"Wyświetl atrybuty: {{ name }}", + "add-attribute":"Dodaj atrybut", + "edit-attribute":"Edytuj atrybut", + "view-attribute":"Wyświetl atrybut", + "remove-attribute":"Usuń atrybut", + "delete-server-text":"Bądź ostrożny, po potwierdzeniu konfiguracja serwera stanie się nieodwracalna.", + "delete-server-title":"Czy na pewno chcesz usunąć serwer?", + "mode":"Tryb konfiguracji zabezpieczeń", + "bootstrap-tab":"Bootstrap", + "bootstrap-server-legend":"Serwer Bootstrap (ShortId...)", + "lwm2m-server-legend":"Serwer LwM2M (ShortId...)", + "server":"Serwer", + "short-id":"Krótki identyfikator serwera", + "short-id-tooltip":"Krótki identyfikator serwera. Używany jako łącze do powiązania instancji obiektu serwera.\nTen identyfikator jednoznacznie identyfikuje każdy serwer LwM2M skonfigurowany dla klienta LwM2M.\nZasób MUSI być ustawiony, gdy Zasób Bootstrap-Server ma wartość „false”.\nWartości ID:0 i ID:65535 NIE MOGĄ być używane do identyfikacji serwera LwM2M.", + "short-id-required":"Krótki identyfikator serwera jest wymagany.", + "short-id-range":"Krótki identyfikator serwera powinien mieć wartość z zakresu od 1 do 65534.", + "short-id-pattern":"Krótki identyfikator serwera musi być liczbą całkowitą dodatnią.", + "lifetime":"Czas życia rejestracji klienta", + "lifetime-required":"Czas życia rejestracji klienta jest wymagany.", + "lifetime-pattern":"Czas życia rejestracji klienta musi być liczbą całkowitą dodatnią.", + "default-min-period":"Minimalny okres między dwoma powiadomieniami (s)", + "default-min-period-tooltip":"Domyślna wartość, jaką klient LwM2M powinien używać dla Minimalnego Okresu Obserwacji w przypadku braku uwzględnienia tego parametru w Obserwacji.", + "default-min-period-required":"Minimalny okres jest wymagany.", + "default-min-period-pattern":"Minimalny okres musi być liczbą całkowitą dodatnią.", + "notification-storing":"Przechowywanie powiadomień przy wyłączonym lub offline", + "binding":"Powiązanie", + "binding-type":{ + "u":"U: Klient jest dostępny za pośrednictwem powiązania UDP w dowolnym czasie.", + "m":"M: Klient jest dostępny za pośrednictwem powiązania MQTT w dowolnym czasie.", + "h":"H: Klient jest dostępny za pośrednictwem powiązania HTTP w dowolnym czasie.", + "t":"T: Klient jest dostępny za pośrednictwem powiązania TCP w dowolnym czasie.", + "s":"S: Klient jest dostępny za pośrednictwem powiązania SMS w dowolnym czasie.", + "n":"N: Klient MUSI wysłać odpowiedź na takie żądanie za pośrednictwem powiązania Non-IP (jest obsługiwane od LWM2M 1.1).", + "uq":"UQ: Połączenie UDP w trybie kolejki (nie jest obsługiwane od LWM2M 1.1)", + "uqs":"UQS: zarówno połączenia UDP, jak i SMS aktywne; UDP w trybie kolejki, SMS w trybie standardowym (nie jest obsługiwane od LWM2M 1.1)", + "tq":"TQ: Połączenie TCP w trybie kolejki (nie jest obsługiwane od LWM2M 1.1)", + "tqs":"TQS: zarówno połączenia TCP, jak i SMS aktywne; TCP w trybie kolejki, SMS w trybie standardowym (nie jest obsługiwane od LWM2M 1.1)", + "sq":"SQ: Połączenie SMS w trybie kolejki (nie jest obsługiwane od LWM2M 1.1)" + }, + "binding-tooltip":"To jest lista w zasobie \"binding\" obiektu serwera LwM2M - /1/x/7. Wskazuje obsługiwane tryby powiązań w kliencie LwM2M. Ta wartość POWINNA być taka sama jak wartość w zasobie \"Supported Binding and Modes\" w obiekcie urządzenia (/3/0/16). Chociaż obsługiwane są różne środki transportu, tylko jedno powiązanie transportowe może być używane podczas całej sesji transportowej. Na przykład, gdy obsługiwane są zarówno UDP, jak i SMS, klient LwM2M i serwer LwM2M mogą wybrać komunikację zarówno przez UDP, jak i SMS przez całą sesję transportową.", + "bootstrap-server":"Serwer rozruchowy", + "lwm2m-server":"Serwer LwM2M", + "include-bootstrap-server":"Załącz aktualizacje serwera rozruchowego", + "bootstrap-update-title":"Masz już skonfigurowany serwer rozruchowy. Czy na pewno chcesz wyłączyć aktualizacje?", + "bootstrap-update-text":"Bądź ostrożny, po potwierdzeniu konfiguracja danych serwera rozruchowego stanie się nieodwracalna.", + "server-host":"Host", + "server-host-required":"Host jest wymagany.", + "server-port":"Port", + "server-port-required":"Port jest wymagany.", + "server-port-pattern":"Port musi być liczbą całkowitą dodatnią.", + "server-port-range":"Port powinien być w zakresie od 1 do 65535.", + "server-public-key":"Klucz publiczny serwera", + "server-public-key-required":"Klucz publiczny serwera jest wymagany.", + "client-hold-off-time":"Czas wstrzymania klienta", + "client-hold-off-time-required":"Czas wstrzymania klienta jest wymagany.", + "client-hold-off-time-pattern":"Czas wstrzymania klienta musi być liczbą całkowitą dodatnią.", + "client-hold-off-time-tooltip":"Czas wstrzymania klienta do użycia tylko z serwerem rozruchowym", + "account-after-timeout":"Konto po przekroczeniu czasu oczekiwania", + "account-after-timeout-required":"Konto po przekroczeniu czasu oczekiwania jest wymagane.", + "account-after-timeout-pattern":"Konto po przekroczeniu czasu oczekiwania musi być liczbą całkowitą dodatnią.", + "account-after-timeout-tooltip":"Wartość konta po przekroczeniu czasu oczekiwania podana przez ten zasób serwera rozruchowego.", + "server-type":"Typ serwera", + "add-new-server-title":"Dodaj nową konfigurację serwera", + "add-server-config":"Dodaj konfigurację serwera", + "add-lwm2m-server-config":"Dodaj serwer LwM2M", + "no-config-servers":"Brak skonfigurowanych serwerów", + "others-tab":"Inne ustawienia", + "client-strategy":"Strategia klienta podczas łączenia", + "client-strategy-label":"Strategia", + "client-strategy-only-observe":"Tylko żądanie obserwacji do klienta po połączeniu początkowym", + "client-strategy-read-all":"Odczytaj wszystkie zasoby i żądanie obserwacji do klienta po rejestracji", + "fw-update":"Aktualizacja oprogramowania", + "fw-update-strategy":"Strategia aktualizacji firmware'u", + "fw-update-strategy-data":"Przesuń aktualizację firmware'u jako plik binarny za pomocą Obiektu 19 i Zasobu 0 (Dane)", + "fw-update-strategy-package":"Przesuń aktualizację firmware'u jako plik binarny za pomocą Obiektu 5 i Zasobu 0 (Pakiet)", + "fw-update-strategy-package-uri":"Automatycznie generuj unikalny adres URL CoAP do pobrania pakietu i przesyłaj aktualizację firmware'u jako Obiekt 5 i Zasób 1 (Pakiet URI)", + "sw-update":"Aktualizacja oprogramowania", + "sw-update-strategy":"Strategia aktualizacji oprogramowania", + "sw-update-strategy-package":"Przesuń plik binarny za pomocą Obiektu 9 i Zasobu 2 (Pakiet)", + "sw-update-strategy-package-uri":"Automatycznie generuj unikalny adres URL CoAP do pobrania pakietu i przesyłaj aktualizację oprogramowania za pomocą Obiektu 9 i Zasób 3 (Pakiet URI)", + "fw-update-resource":"Zasób CoAP aktualizacji firmware'u", + "fw-update-resource-required":"Zasób CoAP aktualizacji firmware'u jest wymagany.", + "sw-update-resource":"Zasób CoAP aktualizacji oprogramowania", + "sw-update-resource-required":"Zasób CoAP aktualizacji oprogramowania jest wymagany.", + "config-json-tab":"Profil konfiguracji urządzenia Json", + "attributes-name":{ + "min-period":"Minimalny okres", + "max-period":"Maksymalny okres", + "greater-than":"Większe niż", + "less-than":"Mniejsze niż", + "step":"Krok", + "min-evaluation-period":"Minimalny okres oceny", + "max-evaluation-period":"Maksymalny okres oceny" + }, + "composite-operations-support":"Obsługuje operacje złożone Odczyt/Zapis/Obserwacja" + }, + "snmp":{ + "add-communication-config":"Dodaj konfigurację komunikacji", + "add-mapping":"Dodaj mapowanie", + "authentication-passphrase":"Hasło uwierzytelniania", + "authentication-passphrase-required":"Wymagane hasło uwierzytelniania.", + "authentication-protocol":"Protokół uwierzytelniania", + "authentication-protocol-required":"Wymagany protokół uwierzytelniania.", + "communication-configs":"Konfiguracje komunikacji", + "community":"Ciąg społeczności", + "community-required":"Wymagany ciąg społeczności.", + "context-name":"Nazwa kontekstu", + "data-key":"Klucz danych", + "data-key-required":"Wymagany klucz danych.", + "data-type":"Typ danych", + "data-type-required":"Wymagany typ danych.", + "engine-id":"ID silnika", + "host":"Host", + "host-required":"Wymagany host.", + "oid":"OID", + "oid-pattern":"Nieprawidłowy format OID.", + "oid-required":"Wymagany OID.", + "please-add-communication-config":"Proszę dodać konfigurację komunikacji", + "please-add-mapping-config":"Proszę dodać konfigurację mapowania", + "port":"Port", + "port-format":"Nieprawidłowy format portu.", + "port-required":"Wymagany port.", + "privacy-passphrase":"Hasło prywatności", + "privacy-passphrase-required":"Wymagane hasło prywatności.", + "privacy-protocol":"Protokół prywatności", + "privacy-protocol-required":"Wymagany protokół prywatności.", + "protocol-version":"Wersja protokołu", + "protocol-version-required":"Wymagana wersja protokołu.", + "querying-frequency":"Częstotliwość zapytań, ms", + "querying-frequency-invalid-format":"Częstotliwość zapytań musi być liczbą całkowitą dodatnią.", + "querying-frequency-required":"Wymagana częstotliwość zapytań.", + "retries":"Ponowienia", + "retries-invalid-format":"Liczba ponowień musi być liczbą całkowitą dodatnią.", + "retries-required":"Wymagane ponowienia.", + "scope":"Zakres", + "scope-required":"Wymagany zakres.", + "security-name":"Nazwa zabezpieczeń", + "security-name-required":"Wymagana nazwa zabezpieczeń.", + "timeout-ms":"Limit czasu, ms", + "timeout-ms-invalid-format":"Limit czasu musi być liczbą całkowitą dodatnią.", + "timeout-ms-required":"Wymagany limit czasu.", + "user-name":"Nazwa użytkownika", + "user-name-required":"Wymagana nazwa użytkownika." + } + }, + "dialog":{ + "close":"Zamknij okno dialogowe", + "error-message-title":"Wiadomość o błędzie:", + "error-details-title":"Szczegóły błędu" + }, + "direction":{ + "column":"Kolumna", + "row":"Wiersz" + }, + "edge":{ + "edge":"Krawędź", + "edge-instances":"Instancje krawędzi", + "instances":"Instancje", + "edge-file":"Plik krawędzi", + "name-max-length":"Nazwa powinna być krótsza niż 256", + "label-max-length":"Etykieta powinna być krótsza niż 256", + "type-max-length":"Typ powinien być krótszy niż 256", + "management":"Zarządzanie krawędzią", + "no-edges-matching":"Brak krawędzi pasujących do '{{entity}}'", + "add":"Dodaj krawędź", + "no-edges-text":"Brak znalezionych krawędzi", + "edge-details":"Szczegóły krawędzi", + "add-edge-text":"Dodaj nową krawędź", + "delete":"Usuń krawędź", + "delete-edge-title":"Czy na pewno chcesz usunąć krawędź '{{edgeName}}'?", + "delete-edge-text":"Bądź ostrożny, po potwierdzeniu krawędź i wszystkie związane z nią dane staną się nieodwracalnie utracone.", + "delete-edges-title":"Czy na pewno chcesz usunąć krawędź { count, plural, =1 {1 krawędź} other {# krawędzi} }?", + "delete-edges-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane krawędzie zostaną usunięte, a wszystkie związane z nimi dane staną się nieodwracalnie utracone.", + "name":"Nazwa", + "name-starts-with":"Nazwa krawędzi zaczyna się od", + "name-required":"Nazwa jest wymagana.", + "description":"Opis", + "details":"Szczegóły", + "events":"Zdarzenia", + "copy-id":"Kopiuj identyfikator krawędzi", + "id-copied-message":"Identyfikator krawędzi został skopiowany do schowka", + "sync":"Synchronizuj krawędź", + "edge-required":"Wymagana krawędź", + "edge-type":"Typ krawędzi", + "edge-type-required":"Wymagany jest typ krawędzi.", + "event-action":"Akcja zdarzenia", + "entity-id":"Identyfikator jednostki", + "select-edge-type":"Wybierz typ krawędzi", + "assign-to-customer":"Przypisz do klienta", + "assign-to-customer-text":"Proszę wybrać klienta, do którego przypisane będą krawędzie", + "assign-edge-to-customer":"Przypisz krawędź do klienta", + "assign-edge-to-customer-text":"Proszę wybrać krawędzie do przypisania do klienta", + "assignedToCustomer":"Przypisane do klienta", + "edge-public":"Krawędź jest publiczna", + "assigned-to-customer":"Przypisane do: {{customerTitle}}", + "unassign-from-customer":"Odłącz od klienta", + "unassign-edge-title":"Czy na pewno chcesz odłączyć krawędź '{{edgeName}}'?", + "unassign-edge-text":"Po potwierdzeniu krawędź zostanie odłączona i nie będzie dostępna dla klienta.", + "unassign-edges-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 krawędź} other {# krawędzie} }?", + "unassign-edges-text":"Po potwierdzeniu wszystkie wybrane krawędzie zostaną odłączone i nie będą dostępne dla klienta.", + "make-public":"Udostępnij publicznie", + "make-public-edge-title":"Czy na pewno chcesz udostępnić publicznie krawędź '{{edgeName}}'?", + "make-public-edge-text":"Po potwierdzeniu krawędź i wszystkie jej dane zostaną udostępnione publicznie i będą dostępne dla innych.", + "make-private":"Udostępnij prywatnie", + "public":"Publiczne", + "make-private-edge-title":"Czy na pewno chcesz udostępnić prywatnie krawędź '{{edgeName}}'?", + "make-private-edge-text":"Po potwierdzeniu krawędź i wszystkie jej dane zostaną udostępnione prywatnie i nie będą dostępne dla innych.", + "import":"Importuj krawędź", + "install-connect-instructions":"Instrukcje instalacji i połączenia", + "install-connect-instructions-edge-created":"Krawędź utworzona! Sprawdź instrukcje instalacji i połączenia", + "loading-edge-instructions":"Ładowanie instrukcji krawędzi...", + "label":"Etykieta", + "load-entity-error":"Nie udało się załadować danych. Jednostka została usunięta.", + "assign-new-edge":"Przypisz nową krawędź", + "unassign-from-edge":"Odłącz od krawędzi", + "edge-key":"Klucz krawędzi", + "copy-edge-key":"Kopiuj klucz krawędzi", + "edge-key-copied-message":"Klucz krawędzi został skopiowany do schowka", + "edge-secret":"Sekret krawędzi", + "copy-edge-secret":"Kopiuj sekret krawędzi", + "edge-secret-copied-message":"Sekret krawędzi został skopiowany do schowka", + "manage-assets":"Zarządzaj zasobami", + "manage-devices":"Zarządzaj urządzeniami", + "manage-entity-views":"Zarządzaj widokami jednostek", + "manage-dashboards":"Zarządzaj pulpitem nawigacyjnym", + "manage-rulechains":"Zarządzaj łańcuchami reguł", + "assets":"Zasoby krawędzi", + "devices":"Urządzenia krawędziowe", + "entity-views":"Widoki jednostek krawędziowych", + "dashboard":"Pulpit nawigacyjny krawędzi", + "dashboards":"Panele nawigacyjne krawędziowe", + "rulechain-templates":"Szablony łańcucha reguł", + "edge-rulechain-templates":"Szablony łańcucha reguł krawędziowych", + "rulechains":"Łańcuchy reguł krawędziowych", + "search":"Wyszukaj krawędzie", + "selected-edges":"{ count, plural, =1 {1 krawędź} other {# krawędzie} } wybrana", + "any-edge":"Dowolna krawędź", + "no-edge-types-matching":"Brak typów krawędzi pasujących do '{{entitySubtype}}'", + "edge-type-list-empty":"Brak wybranych typów krawędzi.", + "edge-types":"Typy krawędzi", + "enter-edge-type":"Wprowadź typ krawędzi", + "deployed":"Wdrożone", + "pending":"Oczekujące", + "downlinks":"Downlinki", + "no-downlinks-prompt":"Brak znalezionych downlinków", + "sync-process-started-successfully":"Proces synchronizacji został pomyślnie uruchomiony!", + "missing-related-rule-chains-title":"Krawędź ma brakujące powiązane łańcuchy reguł", + "missing-related-rule-chains-text":"Przypisane do krawędzi łańcuchy reguł używają węzłów reguł, które przekazują wiadomości do łańcuchów reguł, które nie są przypisane do tej krawędzi.

Lista brakujących łańcuchów reguł:
{{missingRuleChains}}", + "upgrade-instructions":"Instrukcje aktualizacji", + "widget-datasource-error":"Ten widżet obsługuje tylko źródło danych krawędziowe" + }, + "edge-event":{ + "type-dashboard":"Panel nawigacyjny", + "type-asset":"Zasób", + "type-device":"Urządzenie", + "type-device-profile":"Profil urządzenia", + "type-asset-profile":"Profil zasobu", + "type-entity-view":"Widok jednostki", + "type-alarm":"Alarm", + "type-rule-chain":"Łańcuch reguł", + "type-rule-chain-metadata":"Metadane łańcucha reguł", + "type-edge":"Krawędź", + "type-user":"Użytkownik", + "type-tenant":"Najemca", + "type-tenant-profile":"Profil najemcy", + "type-customer":"Klient", + "type-relation":"Relacja", + "type-widgets-bundle":"Pakiet widżetów", + "type-widgets-type":"Typ widżetu", + "type-admin-settings":"Ustawienia administratora", + "type-ota-package":"Pakiet OTA", + "type-queue":"Kolejka", + "action-type-added":"Dodane", + "action-type-deleted":"Usunięte", + "action-type-updated":"Zaktualizowane", + "action-type-post-attributes":"Opublikuj atrybuty", + "action-type-attributes-updated":"Zaktualizowane atrybuty", + "action-type-attributes-deleted":"Usunięte atrybuty", + "action-type-timeseries-updated":"Zaktualizowane serie czasowe", + "action-type-credentials-updated":"Zaktualizowane dane uwierzytelniające", + "action-type-assigned-to-customer":"Przypisane do klienta", + "action-type-unassigned-from-customer":"Odłączone od klienta", + "action-type-relation-add-or-update":"Dodaj lub aktualizuj relację", + "action-type-relation-deleted":"Usunięta relacja", + "action-type-rpc-call":"Wywołanie RPC", + "action-type-alarm-ack":"Potwierdzenie alarmu", + "action-type-alarm-clear":"Wyczyść alarm", + "action-type-alarm-assigned":"Przypisany alarm", + "action-type-alarm-unassigned":"Odłączony alarm", + "action-type-assigned-to-edge":"Przypisane do krawędzi", + "action-type-unassigned-from-edge":"Odłączone od krawędzi", + "action-type-credentials-request":"Żądanie danych uwierzytelniających", + "action-type-entity-merge-request":"Żądanie scalenia jednostki" + }, + "error":{ + "unable-to-connect":"Nie można połączyć się z serwerem! Sprawdź swoje połączenie internetowe.", + "unhandled-error-code":"Niestandardowy kod błędu: {{errorCode}}", + "unknown-error":"Nieznany błąd" + }, + "entity":{ + "entity":"Encja", + "entities":"Encje", + "entities-count":"Liczba encji", + "alarms-count":"Liczba alarmów", + "aliases":"Aliasy encji", + "aliases-short":"Aliasy", + "entity-alias":"Alias encji", + "unable-delete-entity-alias-title":"Nie można usunąć aliasu encji", + "unable-delete-entity-alias-text":"Alias encji '{{entityAlias}}' nie może zostać usunięty, ponieważ jest używany przez następujące widżety:
{{widgetsList}}", + "duplicate-alias-error":"Znaleziono zduplikowany alias '{{alias}}'.
Aleasy encji muszą być unikalne w obrębie deski rozdzielczej.", + "missing-entity-filter-error":"Brakuje filtru dla aliasu '{{alias}}'.", + "configure-alias":"Skonfiguruj alias '{{alias}}'", + "alias":"Alias", + "alias-required":"Wymagany jest alias encji.", + "remove-alias":"Usuń alias encji", + "add-alias":"Dodaj alias encji", + "entity-list":"Lista encji", + "entity-type":"Typ encji", + "entity-types":"Typy encji", + "entity-type-list":"Lista typów encji", + "any-entity":"Dowolna encja", + "add-entity-type":"Dodaj typ encji", + "enter-entity-type":"Wprowadź typ encji", + "no-entities-matching":"Nie znaleziono encji pasujących do '{{entity}}'.", + "no-entity-types-matching":"Nie znaleziono typów encji pasujących do '{{entityType}}'.", + "name-starts-with":"Wyrażenie nazwy", + "help-text":"Użyj '%', zgodnie z potrzebą: '%entity_name_contains%', '%entity_name_ends', 'entity_starts_with'.", + "use-entity-name-filter":"Użyj filtra", + "entity-list-empty":"Nie wybrano żadnych encji.", + "entity-type-list-required":"Należy wybrać co najmniej jeden typ encji.", + "entity-name-filter-required":"Wymagany jest filtr nazwy encji.", + "entity-name-filter-no-entity-matched":"Nie znaleziono encji rozpoczynających się od '{{entity}}'.", + "all-subtypes":"Wszystkie", + "select-entities":"Wybierz encje", + "no-aliases-found":"Nie znaleziono aliasów.", + "no-alias-matching":"'{{alias}}' nie znaleziono.", + "create-new-alias":"Utwórz nowy!", + "create-new":"Utwórz nowy", + "key":"Klucz", + "key-name":"Nazwa klucza", + "no-keys-found":"Nie znaleziono kluczy.", + "no-key-matching":"'{{key}}' nie znaleziono.", + "create-new-key":"Utwórz nowy!", + "type":"Typ", + "type-required":"Wymagany jest typ encji.", + "type-device":"Urządzenie", + "type-devices":"Urządzenia", + "list-of-devices":"{ count, plural, =1 {Jedno urządzenie} other {Lista # urządzeń} }", + "device-name-starts-with":"Urządzenia, których nazwy zaczynają się od '{{prefix}}'", + "type-device-profile":"Profil urządzenia", + "type-device-profiles":"Profile urządzeń", + "clear-selected-profiles":"Wyczyść wybrane profile", + "list-of-device-profiles":"{ count, plural, =1 {Jeden profil urządzenia} other {Lista # profili urządzeń} }", + "device-profile-name-starts-with":"Profile urządzeń, których nazwy zaczynają się od '{{prefix}}'", + "type-asset-profile":"Profil zasobów", + "type-asset-profiles":"Profile zasobów", + "list-of-asset-profiles":"{ count, plural, =1 {Jeden profil zasobów} other {Lista # profili zasobów} }", + "asset-profile-name-starts-with":"Profile zasobów, których nazwy zaczynają się od '{{prefix}}'", + "type-asset":"Zasób", + "type-assets":"Zasoby", + "list-of-assets":"{ count, plural, =1 {Jeden zasób} other {Lista # zasobów} }", + "asset-name-starts-with":"Zasoby, których nazwy zaczynają się od '{{prefix}}'", + "type-entity-view":"Widok encji", + "type-entity-views":"Widoki encji", + "list-of-entity-views":"{ count, plural, =1 {Jeden widok encji} other {Lista # widoków encji} }", + "entity-view-name-starts-with":"Widoki encji, których nazwy zaczynają się od '{{prefix}}'", + "type-rule":"Reguła", + "type-rules":"Reguły", + "list-of-rules":"{ count, plural, =1 {Jedna reguła} other {Lista # reguł} }", + "rule-name-starts-with":"Reguły, których nazwy zaczynają się od '{{prefix}}'", + "type-plugin":"Wtyczka", + "type-plugins":"Wtyczki", + "list-of-plugins":"{ count, plural, =1 {Jedna wtyczka} other {Lista # wtyczek} }", + "plugin-name-starts-with":"Wtyczki, których nazwy zaczynają się od '{{prefix}}'", + "type-tenant":"Najemca", + "type-tenants":"Najemcy", + "list-of-tenants":"{ count, plural, =1 {Jeden najemca} other {Lista # najemców} }", + "tenant-name-starts-with":"Najemcy, których nazwy zaczynają się od '{{prefix}}'", + "type-tenant-profile":"Profil najemcy", + "type-tenant-profiles":"Profile najemcy", + "list-of-tenant-profiles":"{ count, plural, =1 {Jeden profil najemcy} other {Lista # profili najemcy} }", + "tenant-profile-name-starts-with":"Profile najemcy, których nazwy zaczynają się od '{{prefix}}'", + "type-customer":"Klient", + "type-customers":"Klienci", + "list-of-customers":"{ count, plural, =1 {Jeden klient} other {Lista # klientów} }", + "customer-name-starts-with":"Klienci, których nazwy zaczynają się od '{{prefix}}'", + "type-user":"Użytkownik", + "type-users":"Użytkownicy", + "list-of-users":"{ count, plural, =1 {Jeden użytkownik} other {Lista # użytkowników} }", + "user-name-starts-with":"Użytkownicy, których nazwy zaczynają się od '{{prefix}}'", + "type-dashboard":"Deska rozdzielcza", + "type-dashboards":"Deski rozdzielcze", + "list-of-dashboards":"{ count, plural, =1 {Jedna deska rozdzielcza} other {Lista # desek rozdzielczych} }", + "dashboard-name-starts-with":"Deski rozdzielcze, których nazwy zaczynają się od '{{prefix}}'", + "type-alarm":"Alarm", + "type-alarms":"Alarmy", + "list-of-alarms":"{ count, plural, =1 {Jeden alarm} other {Lista # alarmów} }", + "alarm-name-starts-with":"Alarmy, których nazwy zaczynają się od '{{prefix}}'", + "type-rulechain":"Łańcuch reguł", + "type-rulechains":"Łańcuchy reguł", + "list-of-rulechains":"{ count, plural, =1 {Jeden łańcuch reguł} other {Lista # łańcuchów reguł} }", + "rulechain-name-starts-with":"Łańcuchy reguł, których nazwy zaczynają się od '{{prefix}}'", + "type-rulenode":"Węzeł reguły", + "type-rulenodes":"Węzły reguł", + "list-of-rulenodes":"{ count, plural, =1 {Jeden węzeł reguły} other {Lista # węzłów reguł} }", + "rulenode-name-starts-with":"Węzły reguł, których nazwy zaczynają się od '{{prefix}}'", + "type-current-customer":"Bieżący Klient", + "type-current-tenant":"Bieżący Najemca", + "type-current-user":"Bieżący Użytkownik", + "type-current-user-owner":"Bieżący Właściciel Użytkownika", + "type-widgets-bundle":"Zestaw Widżetów", + "type-widgets-bundles":"Zestawy Widżetów", + "list-of-widgets-bundles":"{ count, plural, =1 {Jeden zestaw widżetów} other {Lista # zestawów widżetów} }", + "type-widget":"Widżet", + "type-widgets":"Widżety", + "list-of-widgets":"{ count, plural, =1 {Jeden widżet} other {Lista # widżetów} }", + "search":"Szukaj jednostek", + "selected-entities":"{ count, plural, =1 {1 jednostka} other {# jednostki} } wybranych", + "entity-name":"Nazwa jednostki", + "entity-label":"Etykieta jednostki", + "details":"Szczegóły jednostki", + "no-entities-prompt":"Nie znaleziono jednostek", + "no-data":"Brak danych do wyświetlenia", + "columns-to-display":"Kolumny do wyświetlenia", + "type-api-usage-state":"Stan korzystania z API", + "type-edge":"Edge", + "type-edges":"Edges", + "list-of-edges":"{ count, plural, =1 {Jeden edge} other {Lista # edges} }", + "edge-name-starts-with":"Edges, których nazwy zaczynają się od '{{prefix}}'", + "type-tb-resource":"Zasób", + "type-tb-resources":"Zasoby", + "list-of-tb-resources":"{ count, plural, =1 {Jeden zasób} other {Lista # zasobów} }", + "type-ota-package":"Pakiet OTA", + "type-rpc":"RPC", + "type-queue":"Kolejka", + "type-notification":"Powiadomienie", + "type-notification-rule":"Reguła powiadomień", + "type-notification-rules":"Reguły powiadomień", + "list-of-notification-rules":"{ count, plural, =1 {Jedna reguła powiadomień} other {Lista # reguł powiadomień} }", + "type-notification-target":"Odbiorca powiadomienia", + "type-notification-targets":"Odbiorcy powiadomień", + "list-of-notification-targets":"{ count, plural, =1 {Jeden odbiorca powiadomienia} other {Lista # odbiorców powiadomień} }", + "type-notification-request":"Żądanie powiadomienia", + "type-notification-template":"Szablon powiadomienia", + "type-notification-templates":"Szablony powiadomień", + "list-of-notification-templates":"{ count, plural, =1 {Jeden szablon powiadomienia} other {Lista # szablonów powiadomień} }" + }, + "entity-field":{ + "created-time":"Czas utworzenia", + "name":"Nazwa", + "type":"Typ", + "first-name":"Imię", + "last-name":"Nazwisko", + "email":"E-mail", + "title":"Tytuł", + "country":"Kraj", + "state":"Stan", + "city":"Miasto", + "address":"Adres", + "address2":"Adres 2", + "zip":"Kod pocztowy", + "phone":"Telefon", + "label":"Etykieta" + }, + "entity-view":{ + "entity-view":"Widok encji", + "entity-view-required":"Widok encji jest wymagany.", + "entity-views":"Widoki encji", + "management":"Zarządzanie widokiem encji", + "view-entity-views":"Wyświetl widoki encji", + "entity-view-alias":"Alias widoku encji", + "aliases":"Aliasy widoku encji", + "no-alias-matching":"'{{alias}}' nie znaleziono.", + "no-aliases-found":"Nie znaleziono aliasów.", + "no-key-matching":"'{{key}}' nie znaleziono.", + "no-keys-found":"Nie znaleziono kluczy.", + "create-new-alias":"Utwórz nowy!", + "create-new-key":"Utwórz nowy!", + "duplicate-alias-error":"Znaleziono zduplikowany alias '{{alias}}'.
Aliasy widoku encji muszą być unikalne w obrębie panelu.", + "configure-alias":"Konfiguruj alias '{{alias}}'", + "no-entity-views-matching":"Brak widoków encji pasujących do '{{entity}}'.", + "public":"Publiczny", + "alias":"Alias", + "alias-required":"Wymagany jest alias widoku encji.", + "remove-alias":"Usuń alias widoku encji", + "add-alias":"Dodaj alias widoku encji", + "name-starts-with":"Wyrażenie nazwy widoku encji", + "help-text":"Użyj '%' według potrzeb: '%entity-view_name_contains%', '%entity-view_name_ends', 'entity-view_starts_with'.", + "entity-view-list":"Lista widoków encji", + "use-entity-view-name-filter":"Użyj filtra", + "entity-view-list-empty":"Brak wybranych widoków encji.", + "entity-view-name-filter-required":"Wymagany jest filtr nazwy widoku encji.", + "entity-view-name-filter-no-entity-view-matched":"Nie znaleziono widoków encji rozpoczynających się od '{{entityView}}'.", + "add":"Dodaj widok encji", + "entity-view-public":"Widok encji jest publiczny", + "assign-to-customer":"Przypisz do klienta", + "assign-entity-view-to-customer":"Przypisz Widoki Encji Do Klienta", + "assign-entity-view-to-customer-text":"Wybierz widoki encji do przypisania do klienta", + "assign-entity-view-to-edge-title":"Przypisz Widoki Encji Do Krawędzi", + "no-entity-views-text":"Nie znaleziono widoków encji", + "assign-to-customer-text":"Wybierz klienta, do którego chcesz przypisać widoki encji", + "entity-view-details":"Szczegóły widoku encji", + "add-entity-view-text":"Dodaj nowy widok encji", + "delete":"Usuń widok encji", + "assign-entity-views":"Przypisz widoki encji", + "assign-entity-views-text":"Przypisz { count, plural, =1 {1 widok encji} other {# widoków encji} } do klienta", + "delete-entity-views":"Usuń widoki encji", + "unassign-from-customer":"Odłącz od klienta", + "unassign-entity-views":"Odłącz widoki encji", + "unassign-entity-views-action-title":"Odłącz { count, plural, =1 {1 widok encji} other {# widoków encji} } od klienta", + "assign-new-entity-view":"Przypisz nowy widok encji", + "delete-entity-view-title":"Czy na pewno chcesz usunąć widok encji '{{entityViewName}}'?", + "delete-entity-view-text":"Bądź ostrożny, po potwierdzeniu widok encji i wszystkie związane z nim dane staną się nieodwracalnie utracone.", + "delete-entity-views-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 widok encji} other {# widoków encji} }?", + "delete-entity-views-action-title":"Usuń { count, plural, =1 {1 widok encji} other {# widoków encji} }", + "delete-entity-views-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane widoki encji zostaną usunięte, a wszystkie związane z nimi dane staną się nieodwracalnie utracone.", + "unassign-entity-view-title":"Czy na pewno chcesz odłączyć widok encji '{{entityViewName}}'?", + "unassign-entity-view-text":"Po potwierdzeniu widok encji zostanie odłączony i nie będzie dostępny dla klienta.", + "unassign-entity-view":"Odłącz widok encji", + "unassign-entity-views-title":"Czy na pewno chcesz odłączyć { count, plural, =1 {1 widok encji} other {# widoków encji} }?", + "unassign-entity-views-text":"Po potwierdzeniu wszystkie wybrane widoki encji zostaną odłączone i nie będą dostępne dla klienta.", + "entity-view-type":"Typ widoku encji", + "entity-view-type-required":"Wymagany jest typ widoku encji.", + "select-entity-view-type":"Wybierz typ widoku encji", + "enter-entity-view-type":"Wprowadź typ widoku encji", + "any-entity-view":"Dowolny widok encji", + "no-entity-view-types-matching":"Brak typów widoków encji pasujących do '{{entitySubtype}}'.", + "entity-view-type-list-empty":"Brak wybranych typów widoków encji.", + "entity-view-types":"Typy widoków encji", + "created-time":"Czas utworzenia", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "name-max-length":"Nazwa powinna mieć mniej niż 256 znaków.", + "type-max-length":"Typ widoku jednostki powinien mieć mniej niż 256 znaków.", + "description":"Opis", + "events":"Zdarzenia", + "details":"Szczegóły", + "copyId":"Kopiuj identyfikator widoku jednostki", + "idCopiedMessage":"Identyfikator widoku jednostki został skopiowany do schowka.", + "assignedToCustomer":"Przypisane do klienta", + "unable-entity-view-device-alias-title":"Nie można usunąć aliasu widoku jednostki", + "unable-entity-view-device-alias-text":"Alias urządzenia '{{entityViewAlias}}' nie może zostać usunięty, ponieważ jest używany przez następujące widgety:
{{widgetsList}}", + "select-entity-view":"Wybierz widok jednostki", + "make-public":"Udostępnij widok jednostki publicznie", + "make-private":"Udostępnij widok jednostki prywatnie", + "start-date":"Data rozpoczęcia", + "start-ts":"Czas rozpoczęcia", + "end-date":"Data zakończenia", + "end-ts":"Czas zakończenia", + "date-limits":"Ograniczenia dat", + "client-attributes":"Atrybuty klienta", + "shared-attributes":"Współdzielone atrybuty", + "server-attributes":"Atrybuty serwera", + "timeseries":"Szereg czasowy", + "client-attributes-placeholder":"Atrybuty klienta", + "shared-attributes-placeholder":"Współdzielone atrybuty", + "server-attributes-placeholder":"Atrybuty serwera", + "timeseries-placeholder":"Szereg czasowy", + "target-entity":"Docelowa jednostka", + "attributes-propagation":"Propagacja atrybutów", + "attributes-propagation-hint":"Widok jednostki będzie automatycznie kopiować określone atrybuty z Docelowej Jednostki za każdym razem, gdy zapisujesz lub aktualizujesz ten widok jednostki. Ze względów wydajnościowych atrybuty Docelowej Jednostki nie są propagowane do widoku jednostki przy każdej zmianie atrybutu. Możesz włączyć automatyczną propagację, konfigurując węzeł reguły „kopiuj do widoku” w swoim łańcuchu reguł i łącząc wiadomości „Post attributes” i „Attributes Updated” z nowym węzłem reguły.", + "timeseries-data":"Dane szeregu czasowego", + "timeseries-data-hint":"Skonfiguruj klucze danych szeregu czasowego Docelowej Jednostki, które będą dostępne w widoku jednostki. Te dane szeregu czasowego są tylko do odczytu.", + "search":"Szukaj widoków jednostki", + "selected-entity-views":"{ count, plural, =1 {1 widok jednostki} other {# widoki jednostki} } wybrano", + "make-public-entity-view-title":"Czy na pewno chcesz udostępnić widok jednostki '{{entityViewName}}' publicznie?", + "make-public-entity-view-text":"Po potwierdzeniu widok jednostki i wszystkie jego dane staną się publiczne i dostępne dla innych.", + "make-private-entity-view-title":"Czy na pewno chcesz uczynić widok jednostki '{{entityViewName}}' prywatnym?", + "make-private-entity-view-text":"Po potwierdzeniu widok jednostki i wszystkie jego dane staną się prywatne i nie będą dostępne dla innych.", + "assign-entity-view-to-edge":"Przypisz widok jednostki do urządzenia", + "assign-entity-view-to-edge-text":"Wybierz widoki jednostki do przypisania do urządzenia", + "unassign-entity-view-from-edge-title":"Czy na pewno chcesz odpiąć widok jednostki '{{entityViewName}}'?", + "unassign-entity-view-from-edge-text":"Po potwierdzeniu widok jednostki zostanie odpięty i nie będzie dostępny dla urządzenia.", + "unassign-entity-views-from-edge-action-title":"Odpiąć { count, plural, =1 {1 widok jednostki} other {# widoki jednostki} } od urządzenia", + "unassign-entity-view-from-edge":"Odpiąć widok jednostki", + "unassign-entity-views-from-edge-title":"Czy na pewno chcesz odpiąć { count, plural, =1 {1 widok jednostki} other {# widoki jednostki} }?", + "unassign-entity-views-from-edge-text":"Po potwierdzeniu wszystkie wybrane widoki jednostki zostaną odpięte i nie będą dostępne dla urządzenia." + }, + "event":{ + "event-type":"Typ zdarzenia", + "events-filter":"Filtr zdarzeń", + "clean-events":"Wyczyść zdarzenia", + "type-error":"Błąd", + "type-lc-event":"Zdarzenie cyklu życia", + "type-stats":"Statystyki", + "type-debug-rule-node":"Debug", + "type-debug-rule-chain":"Debug", + "no-events-prompt":"Nie znaleziono zdarzeń", + "error":"Błąd", + "alarm":"Alarm", + "event-time":"Czas zdarzenia", + "server":"Serwer", + "body":"Treść", + "method":"Metoda", + "type":"Typ", + "message":"Wiadomość", + "message-id":"Identyfikator wiadomości", + "copy-message-id":"Kopiuj identyfikator wiadomości", + "message-type":"Typ wiadomości", + "data-type":"Typ danych", + "relation-type":"Typ relacji", + "metadata":"Metadane", + "data":"Dane", + "event":"Zdarzenie", + "status":"Status", + "success":"Sukces", + "failed":"Niepowodzenie", + "messages-processed":"Wiadomości przetworzone", + "max-messages-processed":"Maksymalna ilość wiadomości przetworzonych", + "min-messages-processed":"Minimalna ilość wiadomości przetworzonych", + "errors-occurred":"Wystąpiły błędy", + "max-errors-occurred":"Maksymalna ilość wystąpiłych błędów", + "min-errors-occurred":"Minimalna ilość wystąpiłych błędów", + "min-value":"Minimalna wartość to 0.", + "all-events":"Wszystkie", + "has-error":"Zawiera błąd", + "entity-id":"Identyfikator jednostki", + "copy-entity-id":"Kopiuj identyfikator jednostki", + "entity-type":"Typ jednostki", + "clear-filter":"Wyczyść filtr", + "clear-request-title":"Wyczyść wszystkie zdarzenia", + "clear-request-text":"Czy na pewno chcesz wyczyścić wszystkie zdarzenia?", + "started":"Rozpoczęte", + "updated":"Zaktualizowane", + "stopped":"Zatrzymane" + }, + "extension":{ + "extensions":"Rozszerzenia", + "selected-extensions":"{ count, plural, =1 {1 rozszerzenie} other {# rozszerzeń} } wybranych", + "type":"Typ", + "key":"Klucz", + "value":"Wartość", + "id":"Identyfikator", + "extension-id":"Identyfikator rozszerzenia", + "extension-type":"Typ rozszerzenia", + "transformer-json":"JSON *", + "unique-id-required":"Identyfikator rozszerzenia już istnieje.", + "delete":"Usuń rozszerzenie", + "add":"Dodaj rozszerzenie", + "edit":"Edytuj rozszerzenie", + "delete-extension-title":"Czy na pewno chcesz usunąć rozszerzenie '{{extensionId}}'?", + "delete-extension-text":"Bądź ostrożny, po potwierdzeniu rozszerzenie i wszystkie związane z nim dane staną się nieodwracalnie utracone.", + "delete-extensions-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 rozszerzenie} other {# rozszerzeń} }?", + "delete-extensions-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane rozszerzenia zostaną usunięte.", + "converters":"Konwertery", + "converter-id":"Identyfikator konwertera", + "configuration":"Konfiguracja", + "converter-configurations":"Konfiguracje konwertera", + "token":"Token bezpieczeństwa", + "add-converter":"Dodaj konwerter", + "add-config":"Dodaj konfigurację konwertera", + "device-name-expression":"Wyrażenie nazwy urządzenia", + "device-type-expression":"Wyrażenie typu urządzenia", + "custom":"Niestandardowe", + "to-double":"Do Double", + "transformer":"Transformator", + "json-required":"Wymagany jest JSON transformatora.", + "json-parse":"Nie można sparsować JSON transformatora.", + "attributes":"Atrybuty", + "add-attribute":"Dodaj atrybut", + "add-map":"Dodaj element mapowania", + "timeseries":"Szereg czasowy", + "add-timeseries":"Dodaj szereg czasowy", + "field-required":"Pole jest wymagane", + "brokers":"Brokerzy", + "add-broker":"Dodaj brokera", + "host":"Host", + "port":"Port", + "port-range":"Port powinien mieć zakres od 1 do 65535.", + "ssl":"SSL", + "credentials":"Dane uwierzytelniające", + "username":"Nazwa użytkownika", + "password":"Hasło", + "retry-interval":"Interwał ponawiania w milisekundach", + "anonymous":"Anonimowy", + "basic":"Podstawowy", + "pem":"PEM", + "ca-cert":"Plik certyfikatu CA *", + "private-key":"Plik klucza prywatnego *", + "cert":"Plik certyfikatu *", + "no-file":"Nie wybrano pliku.", + "drop-file":"Upuść plik lub kliknij, aby wybrać plik do przesłania.", + "mapping":"Mapowanie", + "topic-filter":"Filtr tematów", + "converter-type":"Typ konwertera", + "converter-json":"Json", + "json-name-expression":"Wyrażenie nazwy urządzenia JSON", + "topic-name-expression":"Wyrażenie nazwy tematu urządzenia", + "json-type-expression":"Wyrażenie typu urządzenia JSON", + "topic-type-expression":"Wyrażenie typu tematu urządzenia", + "attribute-key-expression":"Wyrażenie klucza atrybutu", + "attr-json-key-expression":"Wyrażenie klucza JSON atrybutu", + "attr-topic-key-expression":"Wyrażenie klucza tematu atrybutu", + "request-id-expression":"Wyrażenie identyfikatora żądania", + "request-id-json-expression":"Wyrażenie identyfikatora JSON żądania", + "request-id-topic-expression":"Wyrażenie identyfikatora tematu żądania", + "response-topic-expression":"Wyrażenie tematu odpowiedzi", + "value-expression":"Wyrażenie wartości", + "topic":"Temat", + "timeout":"Timeout w milisekundach", + "converter-json-required":"Wymagany jest JSON konwertera.", + "converter-json-parse":"Nie można sparsować JSON konwertera.", + "filter-expression":"Wyrażenie filtru", + "connect-requests":"Żądania połączenia", + "add-connect-request":"Dodaj żądanie połączenia", + "disconnect-requests":"Żądania rozłączenia", + "add-disconnect-request":"Dodaj żądanie rozłączenia", + "attribute-requests":"Żądania atrybutów", + "add-attribute-request":"Dodaj żądanie atrybutu", + "attribute-updates":"Aktualizacje atrybutów", + "add-attribute-update":"Dodaj aktualizację atrybutu", + "server-side-rpc":"RPC po stronie serwera", + "add-server-side-rpc-request":"Dodaj żądanie RPC po stronie serwera", + "device-name-filter":"Filtr nazwy urządzenia", + "attribute-filter":"Filtr atrybutu", + "method-filter":"Filtr metody", + "request-topic-expression":"Wyrażenie tematu żądania", + "response-timeout":"Timeout odpowiedzi w milisekundach", + "topic-expression":"Wyrażenie tematu", + "client-scope":"Zakres klienta", + "add-device":"Dodaj urządzenie", + "opc-server":"Serwery OPC", + "opc-add-server":"Dodaj serwer OPC", + "opc-add-server-prompt":"Proszę dodać serwer OPC", + "opc-application-name":"Nazwa aplikacji", + "opc-application-uri":"URI aplikacji", + "opc-scan-period-in-seconds":"Okres skanowania w sekundach", + "opc-security":"Bezpieczeństwo", + "opc-identity":"Tożsamość", + "opc-keystore":"Schronisko klucza", + "opc-type":"Typ", + "opc-keystore-type":"Typ schroniska klucza", + "opc-keystore-location":"Lokalizacja *", + "opc-keystore-password":"Hasło", + "opc-keystore-alias":"Alias", + "opc-keystore-key-password":"Hasło klucza", + "opc-device-node-pattern":"Wzorzec węzła urządzenia", + "opc-device-name-pattern":"Wzorzec nazwy urządzenia", + "modbus-server":"Serwery/slave'y Modbus", + "modbus-add-server":"Dodaj serwer/slave'a Modbus", + "modbus-add-server-prompt":"Proszę dodać serwer/slave'a Modbus", + "modbus-transport":"Transport", + "modbus-tcp-reconnect":"Automatyczne ponowne połączenie", + "modbus-rtu-over-tcp":"RTU przez TCP", + "modbus-port-name":"Nazwa portu szeregowego", + "modbus-encoding":"Kodowanie", + "modbus-parity":"Parzystość", + "modbus-baudrate":"Prędkość transmisji", + "modbus-databits":"Bity danych", + "modbus-stopbits":"Bity stopu", + "modbus-databits-range":"Bity danych powinny mieć zakres od 7 do 8.", + "modbus-stopbits-range":"Bity stopu powinny mieć zakres od 1 do 2.", + "modbus-unit-id":"Identyfikator jednostki", + "modbus-unit-id-range":"Identyfikator jednostki powinien mieć zakres od 1 do 247.", + "modbus-device-name":"Nazwa urządzenia", + "modbus-poll-period":"Okres sondowania (ms)", + "modbus-attributes-poll-period":"Okres sondowania atrybutów (ms)", + "modbus-timeseries-poll-period":"Okres sondowania szeregów czasowych (ms)", + "modbus-poll-period-range":"Okres sondowania powinien być wartością dodatnią.", + "modbus-tag":"Tag", + "modbus-function":"Funkcja", + "modbus-register-address":"Adres rejestru", + "modbus-register-address-range":"Adres rejestru powinien mieć zakres od 0 do 65535.", + "modbus-register-bit-index":"Indeks bitu", + "modbus-register-bit-index-range":"Indeks bitu powinien mieć zakres od 0 do 15.", + "modbus-register-count":"Liczba rejestrów", + "modbus-register-count-range":"Liczba rejestrów powinna być wartością dodatnią.", + "modbus-byte-order":"Kolejność bajtów", + "sync":{ + "status":"Status", + "sync":"Synchronizowane", + "not-sync":"Niesynchronizowane", + "last-sync-time":"Ostatnia synchronizacja", + "not-available":"Niedostępne" + }, + "export-extensions-configuration":"Eksportuj konfigurację rozszerzeń", + "import-extensions-configuration":"Importuj konfigurację rozszerzeń", + "import-extensions":"Importuj rozszerzenia", + "import-extension":"Importuj rozszerzenie", + "export-extension":"Eksportuj rozszerzenie", + "file":"Plik rozszerzeń", + "invalid-file-error":"Błąd - nieprawidłowy plik rozszerzenia" + }, + "feature":{ + "advanced-features":"Zaawansowane funkcje" + }, + "filter":{ + "add":"Dodaj filtr", + "edit":"Edytuj filtr", + "name":"Nazwa filtra", + "name-required":"Wymagana nazwa filtra.", + "duplicate-filter":"Filtr o tej samej nazwie już istnieje.", + "filters":"Filtry", + "unable-delete-filter-title":"Nie można usunąć filtra", + "unable-delete-filter-text":"Nie można usunąć filtra '{{filter}}', ponieważ jest używany przez następujące widżety:
{{widgetsList}}", + "duplicate-filter-error":"Znaleziono zduplikowany filtr '{{filter}}'.
Filtry muszą być unikalne w obrębie pulpitu nawigacyjnego.", + "missing-key-filters-error":"Kluczowe filtry są brakujące w filtrze '{{filter}}'.", + "filter":"Filtr", + "editable":"Możliwość edycji", + "no-filters-found":"Nie znaleziono filtrów.", + "no-filter-text":"Brak określonego filtra", + "add-filter-prompt":"Proszę dodać filtr", + "no-filter-matching":"'{{filter}}' nie znaleziono.", + "create-new-filter":"Utwórz nowy!", + "create-new":"Utwórz nowy", + "filter-required":"Filtr jest wymagany.", + "operation":{ + "operation":"Operacja", + "equal":"równa się", + "not-equal":"nie równa się", + "starts-with":"zaczyna się od", + "ends-with":"kończy się na", + "contains":"zawiera", + "not-contains":"nie zawiera", + "greater":"większa niż", + "less":"mniejsza niż", + "greater-or-equal":"większa lub równa", + "less-or-equal":"mniejsza lub równa", + "and":"i", + "or":"lub", + "in":"w", + "not-in":"nie w" + }, + "ignore-case":"ignoruj wielkość liter", + "value":"Wartość", + "remove-filter":"Usuń filtr", + "duplicate-filter-action":"Zduplikuj filtr", + "preview":"Podgląd filtra", + "no-filters":"Brak skonfigurowanych filtrów", + "add-filter":"Dodaj filtr", + "add-complex-filter":"Dodaj filtr złożony", + "add-complex":"Dodaj złożony", + "complex-filter":"Filtr złożony", + "edit-complex-filter":"Edytuj filtr złożony", + "edit-filter-user-params":"Edytuj parametry użytkownika predykatu filtra", + "filter-user-params":"Parametry użytkownika predykatu filtra", + "user-parameters":"Parametry użytkownika", + "display-label":"Etykieta do wyświetlenia", + "autogenerated-label":"Automatycznie generowana etykieta", + "order-priority":"Priorytet porządkowania pola", + "key-filter":"Filtr klucza", + "key-filters":"Filtry klucza", + "key-name":"Nazwa klucza", + "key-name-required":"Wymagana jest nazwa klucza.", + "key-type":{ + "key-type":"Typ klucza", + "attribute":"Atrybut", + "timeseries":"Szereg czasowy", + "entity-field":"Pole encji", + "constant":"Stała", + "client-attribute":"Atrybut klienta", + "server-attribute":"Atrybut serwera", + "shared-attribute":"Atrybut wspólny" + }, + "value-type":{ + "value-type":"Value type", + "string":"String", + "numeric":"Numeric", + "boolean":"Boolean", + "date-time":"Datetime" + }, + "value-type-required":"Wymagany jest typ wartości klucza.", + "key-value-type-change-title":"Czy na pewno chcesz zmienić typ wartości klucza?", + "key-value-type-change-message":"Jeśli potwierdzisz nowy typ wartości, wszystkie wprowadzone filtry klucza zostaną usunięte.", + "no-key-filters":"Brak skonfigurowanych filtrów klucza", + "add-key-filter":"Dodaj filtr klucza", + "remove-key-filter":"Usuń filtr klucza", + "edit-key-filter":"Edytuj filtr klucza", + "date":"Data", + "time":"Czas", + "current-tenant":"Bieżący najemca", + "current-customer":"Bieżący klient", + "current-user":"Bieżący użytkownik", + "current-device":"Bieżące urządzenie", + "default-value":"Wartość domyślna", + "dynamic-source-type":"Typ źródła dynamicznego", + "dynamic-value":"Wartość dynamiczna", + "no-dynamic-value":"Brak wartości dynamicznej", + "source-attribute":"Atrybut źródła", + "switch-to-dynamic-value":"Przełącz na wartość dynamiczną", + "switch-to-default-value":"Przełącz na wartość domyślną", + "inherit-owner":"Dziedzicz od właściciela", + "source-attribute-not-set":"Jeśli atrybut źródła nie jest ustawiony" + }, + "fullscreen":{ + "expand":"Rozwiń na pełny ekran", + "exit":"Wyjdź z trybu pełnoekranowego", + "toggle":"Przełącz tryb pełnoekranowy", + "fullscreen":"Pełny ekran" + }, + "function":{ + "function":"Funkcja" + }, + "gateway":{ + "add-entry":"Dodaj konfigurację", + "advanced":"Zaawansowane", + "checking-device-activity":"Sprawdzanie aktywności urządzenia", + "command":"Komendy Docker", + "command-copied-message":"Komenda Docker została skopiowana do schowka", + "configuration":"Konfiguracja", + "connector-add":"Dodaj nowy konektor", + "connector-enabled":"Włącz konektor", + "connector-name":"Nazwa konektora", + "connector-name-required":"Nazwa konektora jest wymagana.", + "connector-type":"Typ konektora", + "connector-type-required":"Typ konektora jest wymagany.", + "connectors":"Konektory", + "connectors-config":"Konfiguracja konektorów", + "connectors-table-enabled":"Włączony", + "connectors-table-name":"Nazwa", + "connectors-table-type":"Typ", + "connectors-table-status":"Status", + "connectors-table-actions":"Akcje", + "connectors-table-key":"Klucz", + "connectors-table-class":"Klasa", + "rpc-command-send":"Wyślij", + "rpc-command-result":"Odpowiedź", + "rpc-command-edit-params":"Edytuj parametry", + "gateway-configuration":"Konfiguracja ogólna", + "docker-label":"Użyj poniższej instrukcji, aby uruchomić bramę IoT w Docker Compose z uwierzytelnieniem dla wybranego urządzenia", + "install-docker-compose":"Skorzystaj z instrukcji, aby pobrać, zainstalować i skonfigurować Docker Compose", + "download-configuration-file":"Pobierz plik konfiguracyjny", + "download-docker-compose":"Pobierz plik docker-compose.yml dla Twojej bramy", + "launch-gateway":"Uruchom bramę", + "launch-docker-compose":"Uruchom bramę, używając poniższej komendy w terminalu z folderu zawierającego plik docker-compose.yml", + "create-new-gateway":"Utwórz nową bramę", + "create-new-gateway-text":"Jesteś pewien, że chcesz utworzyć nową bramę o nazwie: '{{gatewayName}}'?", + "created-time":"Czas utworzenia", + "configuration-delete-dialog-header":"Konfiguracje zostaną usunięte", + "configuration-delete-dialog-body":"Wyłączenie Konfiguracji Zdalnej jest możliwe tylko przy fizycznym dostępie do Bramy. Wszystkie wcześniejsze konfiguracje zostaną usunięte.

\nAby wyłączyć konfigurację, wprowadź poniżej nazwę Bramy", + "configuration-delete-dialog-input":"Nazwa Bramy", + "configuration-delete-dialog-input-required":"Nazwa Bramy jest obowiązkowa", + "configuration-delete-dialog-confirm":"Wyłącz", + "delete":"Usuń konfigurację", + "download-tip":"Pobierz plik konfiguracyjny", + "drop-file":"Upuść plik tutaj lub", + "gateway":"Brama", + "gateway-exists":"Urządzenie o tej samej nazwie już istnieje.", + "gateway-name":"Nazwa Bramy", + "gateway-name-required":"Nazwa Bramy jest wymagana.", + "gateway-saved":"Konfiguracja Bramy została pomyślnie zapisana.", + "grpc":"GRPC", + "grpc-keep-alive-timeout":"Limit czasu Keep Alive (w ms)", + "grpc-keep-alive-timeout-required":"Limit czasu Keep Alive jest wymagany", + "grpc-keep-alive-timeout-min":"Limit czasu Keep Alive nie może być mniejszy niż 1", + "grpc-keep-alive-timeout-pattern":"Limit czasu Keep Alive jest nieprawidłowy", + "grpc-keep-alive":"Keep Alive (w ms)", + "grpc-keep-alive-required":"Keep Alive jest wymagany", + "grpc-keep-alive-min":"Keep Alive nie może być mniejszy niż 1", + "grpc-keep-alive-pattern":"Keep Alive jest nieprawidłowy", + "grpc-min-time-between-pings":"Minimalny czas między pingami (w ms)", + "grpc-min-time-between-pings-required":"Minimalny czas między pingami jest wymagany", + "grpc-min-time-between-pings-min":"Minimalny czas między pingami nie może być mniejszy niż 1", + "grpc-min-time-between-pings-pattern":"Minimalny czas między pingami jest nieprawidłowy", + "grpc-min-ping-interval-without-data":"Minimalny interwał pingowania bez danych (w ms)", + "grpc-min-ping-interval-without-data-required":"Minimalny interwał pingowania bez danych jest wymagany", + "grpc-min-ping-interval-without-data-min":"Minimalny interwał pingowania bez danych nie może być mniejszy niż 1", + "grpc-min-ping-interval-without-data-pattern":"Minimalny interwał pingowania bez danych jest nieprawidłowy", + "grpc-max-pings-without-data":"Maksymalna liczba pingów bez danych", + "grpc-max-pings-without-data-required":"Maksymalna liczba pingów bez danych jest wymagana", + "grpc-max-pings-without-data-min":"Maksymalna liczba pingów bez danych nie może być mniejsza niż 1", + "grpc-max-pings-without-data-pattern":"Maksymalna liczba pingów bez danych jest nieprawidłowa", + "inactivity-check-period-seconds":"Okres sprawdzania braku aktywności (w sekundach)", + "inactivity-check-period-seconds-required":"Okres sprawdzania braku aktywności jest wymagany", + "inactivity-check-period-seconds-min":"Okres sprawdzania braku aktywności nie może być mniejszy niż 1", + "inactivity-check-period-seconds-pattern":"Okres sprawdzania braku aktywności jest nieprawidłowy", + "inactivity-timeout-seconds":"Okres braku aktywności (w sekundach)", + "inactivity-timeout-seconds-required":"Okres braku aktywności jest wymagany", + "inactivity-timeout-seconds-min":"Okres braku aktywności nie może być mniejszy niż 1", + "inactivity-timeout-seconds-pattern":"Okres braku aktywności jest nieprawidłowy", + "json-parse":"Nieprawidłowy format JSON.", + "json-required":"To pole nie może być puste.", + "logs":{ + "logs":"Logi", + "days":"dni", + "hours":"godzin", + "minutes":"minut", + "seconds":"sekund", + "date-format":"Format daty", + "date-format-required":"Wymagany format daty", + "log-format":"Format logów", + "log-type":"Typ logu", + "log-format-required":"Wymagany format logów", + "remote":"Zdalne logowanie", + "remote-logs":"Zdalne logi", + "local":"Lokalne logowanie", + "level":"Poziom logowania", + "file-path":"Ścieżka pliku", + "file-path-required":"Wymagana ścieżka pliku", + "saving-period":"Okres zapisywania logów", + "saving-period-min":"Okres zapisywania logów nie może być krótszy niż 1", + "saving-period-required":"Wymagany okres zapisywania logów", + "backup-count":"Liczba kopii zapasowych", + "backup-count-min":"Liczba kopii zapasowych nie może być mniejsza niż 1", + "backup-count-required":"Wymagana liczba kopii zapasowych" + }, + "min-pack-send-delay":"Minimalny opóźnienie wysyłki paczki (w ms)", + "min-pack-send-delay-required":"Wymagane minimalne opóźnienie wysyłki paczki", + "min-pack-send-delay-min":"Minimalne opóźnienie wysyłki paczki nie może być mniejsze niż 0", + "no-connectors":"Brak konektorów", + "no-data":"Brak konfiguracji", + "no-gateway-found":"Nie znaleziono bramy.", + "no-gateway-matching":"Brak dopasowania do '{{item}}'", + "path-logs":"Ścieżka do plików dziennika", + "path-logs-required":"Wymagana ścieżka", + "permit-without-calls":"Zezwalaj na keep alive bez wywołań", + "remote":"Zdalna konfiguracja", + "remote-logging-level":"Poziom logowania", + "remove-entry":"Usuń konfigurację", + "remote-shell":"Zdalny shell", + "remote-configuration":"Zdalna konfiguracja", + "other":"Inne", + "save-tip":"Zapisz plik konfiguracyjny", + "security-type":"Typ zabezpieczeń", + "security-types":{ + "access-token":"Token dostępu", + "username-password":"Nazwa użytkownika i hasło", + "tls":"TLS", + "tls-access-token":"TLS + Token dostępu", + "tls-private-key":"TLS + Klucz prywatny" + }, + "server-port":"Port serwera", + "statistics":{ + "statistic":"Statystyka", + "statistics":"Statystyki", + "statistic-commands-empty":"Brak dostępnych statystyk", + "commands":"Polecenia", + "send-period":"Okres wysyłania statystyk (w sekundach)", + "send-period-required":"Okres wysyłania statystyk jest wymagany", + "send-period-min":"Okres wysyłania statystyk nie może być krótszy niż 60", + "send-period-pattern":"Okres wysyłania statystyk jest nieprawidłowy", + "check-connectors-configuration":"Sprawdź konfigurację łączników (w sekundach)", + "check-connectors-configuration-required":"Sprawdzenie konfiguracji łączników jest wymagane", + "check-connectors-configuration-min":"Sprawdzenie konfiguracji łączników nie może być krótsze niż 1", + "check-connectors-configuration-pattern":"Sprawdzenie konfiguracji łączników jest nieprawidłowe", + "add":"Dodaj polecenie", + "timeout":"Limit czasu", + "timeout-ms":"Limit czasu (w ms)", + "timeout-required":"Limit czasu jest wymagany", + "timeout-min":"Limit czasu nie może być krótszy niż 1", + "timeout-pattern":"Limit czasu jest nieprawidłowy", + "attribute-name":"Nazwa atrybutu", + "attribute-name-required":"Nazwa atrybutu jest wymagana", + "command":"Polecenie", + "command-required":"Polecenie jest wymagane", + "command-pattern":"Polecenie jest nieprawidłowe", + "remove":"Usuń polecenie" + }, + "storage":"Magazyn", + "storage-max-file-records":"Maksymalna liczba rekordów w pliku", + "storage-max-files":"Maksymalna liczba plików", + "storage-max-files-min":"Minimalna liczba wynosi 1.", + "storage-max-files-pattern":"Liczba jest nieprawidłowa.", + "storage-max-files-required":"Wymagana jest liczba.", + "storage-max-records":"Maksymalna liczba rekordów w magazynie", + "storage-max-records-min":"Minimalna liczba rekordów wynosi 1.", + "storage-max-records-pattern":"Liczba jest nieprawidłowa.", + "storage-max-records-required":"Wymagana jest maksymalna liczba rekordów.", + "storage-read-record-count":"Liczba odczytanych rekordów w magazynie", + "storage-read-record-count-min":"Minimalna liczba rekordów wynosi 1.", + "storage-read-record-count-pattern":"Liczba jest nieprawidłowa.", + "storage-read-record-count-required":"Wymagana jest liczba odczytanych rekordów.", + "storage-max-read-record-count":"Maksymalna liczba odczytanych rekordów w magazynie", + "storage-max-read-record-count-min":"Minimalna liczba rekordów wynosi 1.", + "storage-max-read-record-count-pattern":"Liczba jest nieprawidłowa.", + "storage-max-read-record-count-required":"Wymagana jest maksymalna liczba odczytanych rekordów.", + "storage-data-folder-path":"Ścieżka folderu danych", + "storage-data-folder-path-required":"Wymagana jest ścieżka folderu danych.", + "storage-pack-size":"Maksymalny rozmiar pakietu zdarzeń", + "storage-pack-size-min":"Minimalna liczba wynosi 1.", + "storage-pack-size-pattern":"Liczba jest nieprawidłowa.", + "storage-pack-size-required":"Wymagany jest maksymalny rozmiar pakietu zdarzeń.", + "storage-path":"Ścieżka magazynu", + "storage-path-required":"Wymagana jest ścieżka magazynu.", + "storage-type":"Typ magazynu", + "storage-types":{ + "file-storage":"Magazyn plików", + "memory-storage":"Magazyn pamięci", + "sqlite":"SQLite" + }, + "thingsboard":"ThingsBoard", + "general":"Ogólne", + "thingsboard-host":"Host ThingsBoard", + "thingsboard-host-required":"Host jest wymagany.", + "thingsboard-port":"Port ThingsBoard", + "thingsboard-port-max":"Maksymalny numer portu to 65535.", + "thingsboard-port-min":"Minimalny numer portu to 1.", + "thingsboard-port-pattern":"Port jest niepoprawny.", + "thingsboard-port-required":"Port jest wymagany.", + "tidy":"Porządkuj", + "tidy-tip":"Porządkuj konfigurację JSON", + "title-connectors-json":"Konfiguracja konektora {{typeName}}", + "tls-path-ca-certificate":"Ścieżka do certyfikatu CA na gatewayu", + "tls-path-client-certificate":"Ścieżka do certyfikatu klienta na gatewayu", + "messages-ttl-check-in-hours":"Sprawdź TTL wiadomości w godzinach", + "messages-ttl-check-in-hours-required":"Sprawdzenie TTL wiadomości w godzinach jest wymagane.", + "messages-ttl-check-in-hours-min":"Minimalna liczba to 1.", + "messages-ttl-check-in-hours-pattern":"Liczba jest niepoprawna.", + "messages-ttl-in-days":"TTL wiadomości w dniach", + "messages-ttl-in-days-required":"TTL wiadomości w dniach jest wymagane.", + "messages-ttl-in-days-min":"Minimalna liczba to 1.", + "messages-ttl-in-days-pattern":"Liczba jest niepoprawna.", + "mqtt-qos":"QoS", + "mqtt-qos-required":"QoS jest wymagane", + "mqtt-qos-range":"Wartości QoS są w zakresie od 0 do 1", + "tls-path-private-key":"Ścieżka do prywatnego klucza na gatewayu", + "toggle-fullscreen":"Przełącz pełny ekran", + "transformer-json-config":"Konfiguracja JSON*", + "update-config":"Dodaj/aktualizuj konfigurację JSON", + "hints":{ + "remote-configuration":"Umożliwia zdalną konfigurację i zarządzanie bramką", + "remote-shell":"Umożliwia zdalne sterowanie systemem operacyjnym bramki z widżetu Zdalnej Powłoki", + "host":"Nazwa hosta lub adres IP serwera ThingsBoard", + "port":"Port usługi MQTT na serwerze ThingsBoard", + "token":"Token dostępowy dla bramki na serwerze ThingsBoard", + "client-id":"Identyfikator klienta MQTT dla bramki na serwerze ThingsBoard", + "username":"Nazwa użytkownika MQTT dla bramki na serwerze ThingsBoard", + "password":"Hasło MQTT dla bramki na serwerze ThingsBoard", + "ca-cert":"Ścieżka do pliku certyfikatu CA", + "date-form":"Format daty w komunikatach dziennika", + "data-folder":"Ścieżka do folderu, który będzie zawierał dane (względna lub bezwzględna)", + "log-format":"Format komunikatu dziennika", + "remote-log":"Umożliwia zdalne logowanie i odczyt dziennika z bramki", + "backup-count":"Jeśli liczba kopii zapasowych > 0, po dokonaniu zmiany rolki, nie więcej niż określona liczba plików kopii zapasowych jest przechowywana - najstarsze zostaną usunięte", + "storage":"Zapewnia konfigurację zapisu przychodzących danych przed ich wysłaniem na platformę", + "max-file-count":"Maksymalna liczba plików, które zostaną utworzone", + "max-read-count":"Liczba wiadomości do pobrania z magazynu i wysłania do ThingsBoard", + "max-records":"Maksymalna liczba rekordów przechowywanych w jednym pliku", + "read-record-count":"Liczba wiadomości do pobrania z magazynu i wysłania do ThingsBoard", + "max-records-count":"Maksymalna liczba danych w magazynie przed wysłaniem do ThingsBoard", + "ttl-check-hour":"Jak często brama sprawdza dane pod kątem przestarzałości", + "ttl-messages-day":"Maksymalna liczba dni, przez które dane będą przechowywane w magazynie", + "commands":"Polecenia do zbierania dodatkowych statystyk", + "attribute":"Klucz telemetrii statystyk", + "timeout":"Limit czasu na wykonanie polecenia", + "command":"Wynik wykonania polecenia, będzie używany jako wartość telemetrii", + "check-device-activity":"Umożliwia monitorowanie aktywności każdego podłączonego urządzenia", + "inactivity-timeout":"Czas po którym brama rozłączy urządzenie", + "inactivity-period":"Okresowość sprawdzania aktywności urządzenia", + "minimal-pack-delay":"Opóźnienie między wysyłką paczek wiadomości (zmniejszenie tego ustawienia zwiększa zużycie procesora)", + "qos":"Jakość usługi w komunikacji MQTT (0 - przynajmniej raz, 1 - co najmniej raz)", + "server-port":"Port sieciowy, na którym serwer GRPC nasłuchuje nadchodzących połączeń.", + "grpc-keep-alive-timeout":"Maksymalny czas oczekiwania serwera na odpowiedź keepalive ping przed uznaniem połączenia za martwe.", + "grpc-keep-alive":"Czas między dwoma kolejnymi wiadomościami keepalive ping, gdy nie ma aktywnego wywołania RPC.", + "grpc-min-time-between-pings":"Minimalny czas oczekiwania serwera między wysłaniem wiadomości keepalive ping.", + "grpc-max-pings-without-data":"Maksymalna liczba wiadomości keepalive ping, które serwer może wysłać, nie odbierając żadnych danych, zanim uzna połączenie za martwe.", + "grpc-min-ping-interval-without-data":"Minimalny czas oczekiwania serwera między wysłaniem wiadomości keepalive ping, gdy nie są przesyłane ani odbierane żadne dane.", + "permit-without-calls":"Zezwalaj serwerowi na utrzymanie połączenia GRPC aktywnego, nawet gdy nie ma aktywnych wywołań RPC." + } + }, + "grid":{ + "delete-item-title":"Czy na pewno chcesz usunąć ten element?", + "delete-item-text":"Bądź ostrożny, po potwierdzeniu ten element i wszystkie powiązane dane staną się nieodwracalne.", + "delete-items-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 element} other {# elementów} }?", + "delete-items-action-title":"Usuń { count, plural, =1 {1 element} other {# elementów} }", + "delete-items-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane elementy zostaną usunięte, a wszystkie powiązane dane staną się nieodwracalne.", + "add-item-text":"Dodaj nowy element", + "no-items-text":"Nie znaleziono elementów", + "item-details":"Szczegóły elementu", + "delete-item":"Usuń element", + "delete-items":"Usuń elementy", + "scroll-to-top":"Przewiń do góry" + }, + "help":{ + "goto-help-page":"Przejdź do strony pomocy", + "show-help":"Pokaż pomoc" + }, + "home":{ + "home":"Strona główna", + "profile":"Profil", + "logout":"Wyloguj się", + "menu":"Menu", + "avatar":"Awatar", + "open-user-menu":"Otwórz menu użytkownika" + }, + "file-input":{ + "browse-file":"Przeglądaj plik", + "browse-files":"Przeglądaj pliki" + }, + "image":{ + "gallery":"Galeria obrazów", + "search":"Wyszukaj obraz", + "selected-images":"{ count, plural, =1 {1 obraz} other {# obrazy} } wybranych", + "created-time":"Czas utworzenia", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "resolution":"Rozdzielczość", + "size":"Rozmiar", + "system":"System", + "download-image":"Pobierz obraz", + "export-image":"Eksportuj obraz do JSON", + "import-image":"Importuj obraz z JSON", + "upload-image":"Prześlij obraz", + "edit-image":"Edytuj obraz", + "image-details":"Szczegóły obrazu", + "no-images":"Nie znaleziono obrazów", + "delete-image":"Usuń obraz", + "delete-image-title":"Czy na pewno chcesz usunąć obraz '{{imageTitle}}'?", + "delete-image-text":"Bądź ostrożny, po potwierdzeniu obraz stanie się nieodwracalnie utracony.", + "delete-images-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 obraz} other {# obrazy} }?", + "delete-images-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane obrazy zostaną usunięte, a wszelkie powiązane dane staną się nieodwracalnie utracone.", + "list-mode":"Widok listy", + "grid-mode":"Widok siatki", + "image-preview":"Podgląd obrazu", + "update-image":"Aktualizuj obraz", + "export-failed-error":"Nie można wyeksportować obrazu: {{error}}", + "image-json-file":"Plik JSON obrazu", + "invalid-image-json-file-error":"Nie można zaimportować obrazu z JSON: Nieprawidłowa struktura danych JSON obrazu.", + "image-is-in-use":"Obraz jest używany przez inne jednostki", + "images-are-in-use":"Obrazy są używane przez inne jednostki", + "image-is-in-use-text":"Obraz '{{title}}' nie został usunięty, ponieważ jest używany przez następujące jednostki:", + "images-are-in-use-text":"Nie wszystkie obrazy zostały usunięte, ponieważ są używane przez inne jednostki.
Możesz zobaczyć odwołane jednostki, klikając przycisk Odwołania w odpowiednim wierszu obrazu.
Jeśli nadal chcesz usunąć te obrazy, zaznacz je w tabeli poniżej i kliknij przycisk Usuń zaznaczone.", + "delete-image-in-use-text":"Jeśli nadal chcesz usunąć obraz, kliknij przycisk Usuń tak czy inaczej.", + "system-entities":"Jednostki systemowe:", + "entities":"jednostki:", + "references":"Odwołania", + "include-system-images":"Dołącz obrazy systemowe", + "clear-image":"Wyczyść obraz", + "no-image":"Brak obrazu", + "no-image-selected":"Nie wybrano obrazu", + "browse-from-gallery":"Przeglądaj z galerii", + "set-link":"Ustaw link", + "image-link":"Link obrazu", + "link":"Link", + "copy-image-link":"Kopiuj link obrazu", + "embed-image":"Osadź obraz", + "embed-to-html":"Osadź w HTML", + "embed-to-html-hint":"Ta funkcja umożliwia udostępnianie linku każdemu nieautoryzowanemu użytkownikowi.", + "embed-to-html-text":"Za pomocą poniższego fragmentu kodu możesz osadzić obraz w komponentach opartych na prostym HTML.
Takie komponenty obejmują widżety karty HTML, funkcje zawartości komórek itp.", + "embed-to-angular-template":"Osadź w szablonie Angular HTML", + "embed-to-angular-template-text":"Za pomocą poniższego fragmentu kodu możesz osadzić obraz w szablonie Angular HTML.
Takie komponenty obejmują widżet Markdown, sekcję HTML w edytorze widżetów, niestandardowe akcje itp." + }, + "image-input":{ + "drop-images-or":"Przeciągnij i upuść obrazy lub", + "drag-and-drop":"Przeciągnij i Upuść", + "or":"lub", + "browse":"Przeglądaj", + "no-images":"Brak wybranych obrazów", + "images":"obrazy" + }, + "import":{ + "no-file":"Nie wybrano pliku", + "drop-file":"Przeciągnij plik JSON lub kliknij, aby wybrać plik do przesłania.", + "drop-json-file-or":"Przeciągnij plik JSON lub", + "drop-file-csv":"Przeciągnij plik CSV lub kliknij, aby wybrać plik do przesłania.", + "drop-file-csv-or":"Przeciągnij plik CSV lub", + "column-value":"Wartość", + "column-title":"Tytuł", + "column-example":"Przykładowa wartość danych", + "column-key":"Atrybut/klucz telemetryczny", + "credentials":"Dane uwierzytelniające", + "csv-delimiter":"Separator CSV", + "csv-first-line-header":"Pierwsza linia zawiera nazwy kolumn", + "csv-update-data":"Aktualizuj atrybuty/telemetrię", + "details":"Szczegóły", + "import-csv-number-columns-error":"Plik powinien zawierać co najmniej dwie kolumny", + "import-csv-invalid-format-error":"Nieprawidłowy format pliku. Linia: '{{line}}'", + "column-type":{ + "name":"Nazwa", + "type":"Typ", + "label":"Etykieta", + "column-type":"Typ kolumny", + "client-attribute":"Atrybut klienta", + "shared-attribute":"Wspólny atrybut", + "server-attribute":"Atrybut serwera", + "timeseries":"Szereg czasowy", + "entity-field":"Pole encji", + "access-token":"Token dostępu", + "x509":"X.509", + "mqtt":{ + "client-id":"ID klienta MQTT", + "user-name":"Nazwa użytkownika MQTT", + "password":"Hasło MQTT" + }, + "lwm2m":{ + "client-endpoint":"Nazwa klienta LwM2M endpoint", + "security-config-mode":"Tryb konfiguracji bezpieczeństwa LwM2M", + "client-identity":"Tożsamość klienta LwM2M", + "client-key":"Klucz klienta LwM2M", + "client-cert":"Certyfikat publiczny klienta LwM2M", + "bootstrap-server-security-mode":"Tryb bezpieczeństwa serwera rozruchowego LwM2M", + "bootstrap-server-secret-key":"Tajny klucz serwera rozruchowego LwM2M", + "bootstrap-server-public-key-id":"Klucz publiczny lub identyfikator serwera rozruchowego LwM2M", + "lwm2m-server-security-mode":"Tryb bezpieczeństwa serwera LwM2M", + "lwm2m-server-secret-key":"Tajny klucz serwera LwM2M", + "lwm2m-server-public-key-id":"Klucz publiczny lub identyfikator serwera LwM2M" + }, + "snmp":{ + "host":"Host SNMP", + "port":"Port SNMP", + "version":"Wersja SNMP (v1, v2c lub v3)", + "community-string":"Ciąg społeczności SNMP" + }, + "isgateway":"Czy to jest Bramą", + "activity-time-from-gateway-device":"Czas aktywności urządzenia bramowego", + "description":"Opis", + "routing-key":"Klucz brzegowy", + "secret":"Sekret brzegowy" + }, + "stepper-text":{ + "select-file":"Wybierz plik", + "configuration":"Importuj konfigurację", + "column-type":"Wybierz typy kolumn", + "creat-entities":"Tworzenie nowych jednostek" + }, + "message":{ + "create-entities":"{{count}} nowych jednostek zostało pomyślnie utworzonych.", + "update-entities":"{{count}} jednostek zostało pomyślnie zaktualizowanych.", + "error-entities":"Wystąpił błąd podczas tworzenia {{count}} jednostek." + } + }, + "item":{ + "selected":"Wybrane" + }, + "js-func":{ + "no-return-error":"Funkcja musi zwrócić wartość!", + "return-type-mismatch":"Funkcja musi zwrócić wartość typu '{{type}}'!", + "tidy":"Porządek", + "mini":"Mini" + }, + "key-val":{ + "key":"Klucz", + "value":"Wartość", + "remove-entry":"Usuń wpis", + "add-entry":"Dodaj wpis", + "no-data":"Brak danych" + }, + "layout":{ + "layout":"Układ", + "layouts":"Układy", + "manage":"Zarządzaj układami", + "settings":"Ustawienia układu", + "color":"Kolor", + "main":"Główny", + "right":"Prawo", + "left":"Lewo", + "select":"Wybierz docelowy układ", + "percentage-width":"Szerokość procentowa (%)", + "fixed-width":"Szerokość stała (px)", + "left-width":"Szerokość lewej kolumny (%)", + "right-width":"Szerokość prawej kolumny (%)", + "pick-fixed-side":"Stała strona: ", + "layout-fixed-width":"Szerokość stała (px)", + "value-min-error":"Wartość musi być większa niż {{min}}{{unit}}", + "value-max-error":"Wartość musi być mniejsza niż {{max}}{{unit}}", + "layout-fixed-width-required":"Szerokość stała jest wymagana", + "right-width-percentage-required":"Wymagany jest procent szerokości prawej strony", + "left-width-percentage-required":"Wymagany jest procent szerokości lewej strony", + "divider":"Podziałka", + "right-side":"Układ prawej strony", + "left-side":"Układ lewej strony" + }, + "legend":{ + "direction":"Kierunek", + "position":"Pozycja", + "show-values":"Pokaż wartości", + "min-option":"Min", + "max-option":"Maks.", + "average-option":"Średnia", + "total-option":"Suma", + "latest-option":"Najnowsza", + "sort-legend":"Sortuj klucze danych w legendzie", + "show-max":"Pokaż maksymalną wartość", + "show-min":"Pokaż minimalną wartość", + "show-avg":"Pokaż średnią wartość", + "show-total":"Pokaż sumę wartości", + "show-latest":"Pokaż najnowszą wartość", + "settings":"Ustawienia legendy", + "min":"min", + "max":"maks.", + "avg":"śr.", + "total":"suma", + "latest":"najnowsza", + "comparison-time-ago":{ + "previousInterval":"(poprzedni przedział)", + "customInterval":"(niestandardowy przedział)", + "days":"(dzień temu)", + "weeks":"(tydzień temu)", + "months":"(miesiąc temu)", + "years":"(rok temu)" + }, + "label":"Etykieta", + "value":"Wartość" + }, + "login":{ + "login":"Zaloguj się", + "request-password-reset":"Zażądaj resetu hasła", + "reset-password":"Resetuj hasło", + "create-password":"Utwórz hasło", + "two-factor-authentication":"Autentykacja dwuskładnikowa", + "passwords-mismatch-error":"Wprowadzone hasła muszą być takie same!", + "password-again":"Powtórz hasło", + "sign-in":"Proszę się zalogować", + "username":"Nazwa użytkownika (e-mail)", + "remember-me":"Zapamiętaj mnie", + "forgot-password":"Zapomniałeś hasła?", + "password-reset":"Reset hasła", + "expired-password-reset-message":"Twoje dane uwierzytelniające wygasły! Proszę utworzyć nowe hasło.", + "new-password":"Nowe hasło", + "new-password-again":"Potwierdź nowe hasło", + "password-link-sent-message":"Link do resetowania hasła został wysłany", + "email":"E-mail", + "login-with":"Zaloguj się za pomocą {{name}}", + "or":"lub", + "error":"Błąd logowania", + "verify-your-identity":"Zweryfikuj swoją tożsamość", + "select-way-to-verify":"Wybierz sposób weryfikacji", + "resend-code":"Wyślij kod ponownie", + "resend-code-wait":"Ponownie wyślij kod za { time, plural, =1 {1 sekundę} other {# sekundy} }", + "try-another-way":"Spróbuj inną metodę", + "totp-auth-description":"Proszę podać kod z aplikacji autoryzacyjnej.", + "totp-auth-placeholder":"Kod", + "sms-auth-description":"Kod zabezpieczający został wysłany na Twój telefon pod numerem {{contact}}.", + "sms-auth-placeholder":"Kod SMS", + "email-auth-description":"Kod zabezpieczający został wysłany na Twój adres e-mailowy {{contact}}.", + "email-auth-placeholder":"Kod e-mailowy", + "backup-code-auth-description":"Proszę podać jeden z kodów zapasowych.", + "backup-code-auth-placeholder":"Kod zapasowy" + }, + "markdown":{ + "edit":"Edytuj", + "preview":"Podgląd", + "copy-code":"Kliknij, aby skopiować", + "copied":"Skopiowano!" + }, + "notification":{ + "action-button":"Przycisk akcji", + "action-type":"Typ akcji", + "active":"Aktywny", + "add-notification-recipients-group":"Dodaj grupę odbiorców powiadomień", + "add-notification-template":"Dodaj szablon powiadomienia", + "add-recipient":"Dodaj odbiorcę", + "add-recipients":"Dodaj odbiorców", + "add-rule":"Dodaj regułę", + "add-stage":"Dodaj etap", + "add-template":"Dodaj szablon", + "after":"Po", + "alarm-assignment-trigger-settings":"Ustawienia wyzwalacza przypisania alarmu", + "alarm-comment-trigger-settings":"Ustawienia wyzwalacza komentarza alarmu", + "alarm-trigger-settings":"Ustawienia wyzwalacza alarmu", + "all":"Wszystkie", + "api-feature-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich funkcji API", + "api-usage-trigger-settings":"Ustawienia wyzwalacza korzystania z API", + "new-platform-version-trigger-settings":"Ustawienia wyzwalacza nowej wersji platformy", + "rate-limits-trigger-settings":"Ustawienia wyzwalacza przekroczenia limitów szybkości", + "at-least-one-should-be-selected":"Przynajmniej jedna pozycja musi być zaznaczona", + "basic-settings":"Podstawowe ustawienia", + "button-text":"Tekst przycisku", + "button-text-required":"Tekst przycisku jest wymagany", + "button-text-max-length":"Tekst przycisku powinien być krótszy lub równy {{ length }} znaków", + "compose":"Komponuj", + "conversation":"Rozmowa", + "conversation-required":"Rozmowa jest wymagana", + "copy-notification-template":"Skopiuj szablon powiadomienia", + "copy-rule":"Skopiuj regułę", + "copy-template":"Skopiuj szablon", + "create-new":"Utwórz nowe", + "created":"Utworzono", + "delete-notification-text":"Uważaj, po potwierdzeniu powiadomienie stanie się nieodwracalne.", + "delete-notification-title":"Czy na pewno chcesz usunąć powiadomienie?", + "delete-notifications-text":"Uważaj, po potwierdzeniu powiadomienia staną się nieodwracalne.", + "delete-notifications-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 powiadomienie} other {# powiadomienia} }?", + "delete-recipient-text":"Uważaj, po potwierdzeniu odbiorca stanie się nieodwracalny.", + "delete-recipient-title":"Czy na pewno chcesz usunąć odbiorcę '{{recipientName}}'?", + "delete-recipients-text":"Uważaj, po potwierdzeniu odbiorcy staną się nieodwracalni.", + "delete-recipients-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 odbiorcę} other {# odbiorców} }?", + "delete-request-text":"Uważaj, po potwierdzeniu żądanie stanie się nieodwracalne.", + "delete-request-title":"Czy na pewno chcesz usunąć żądanie?", + "delete-requests-text":"Uważaj, po potwierdzeniu żądania staną się nieodwracalne.", + "delete-requests-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 żądanie} other {# żądań} }?", + "delete-rule-text":"Uważaj, po potwierdzeniu reguła stanie się nieodwracalna.", + "delete-rule-title":"Czy na pewno chcesz usunąć regułę '{{ruleName}}'?", + "delete-rules-text":"Uważaj, po potwierdzeniu reguły staną się nieodwracalne.", + "delete-rules-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 regułę} other {# reguł} }?", + "delete-template-text":"Uważaj, po potwierdzeniu szablon stanie się nieodwracalny.", + "delete-template-title":"Czy na pewno chcesz usunąć szablon '{{templateName}}'?", + "delete-templates-text":"Uważaj, po potwierdzeniu szablony staną się nieodwracalne.", + "delete-templates-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 szablon} other {# szablonów} }?", + "deleted":"Usunięto", + "delivery-method":{ + "delivery-method":"Metoda dostarczania", + "email":"Email", + "email-preview":"Podgląd powiadomienia email", + "slack":"Slack", + "slack-preview":"Podgląd powiadomienia Slack", + "microsoft-teams":"Microsoft Teams", + "microsoft-teams-preview":"Podgląd powiadomienia Microsoft Teams", + "sms":"SMS", + "sms-preview":"Podgląd powiadomienia SMS", + "web":"Web", + "web-preview":"Podgląd powiadomienia web" + }, + "delivery-method-not-configure-click":"Metoda dostarczania nie jest skonfigurowana. Kliknij, aby skonfigurować.", + "delivery-method-not-configure-contact":"Metoda dostarczania nie jest skonfigurowana. Skontaktuj się z administratorem systemu.", + "delivery-methods":"Metody dostarczania", + "description":"Opis", + "device-activity-trigger-settings":"Ustawienia wyzwalacza aktywności urządzenia", + "device-list-rule-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich urządzeń", + "device-profiles-list-rule-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich profili urządzeń", + "disabled":"Wyłączone", + "edit-notification-recipients-group":"Edytuj grupę odbiorców powiadomień", + "edit-notification-template":"Edytuj szablon powiadomień", + "edit-rule":"Edytuj regułę", + "edit-template":"Edytuj szablon", + "enabled":"Włączone", + "entities-limit-trigger-settings":"Ustawienia wyzwalacza limitu encji", + "entity-action-trigger-settings":"Ustawienia wyzwalacza akcji encji", + "entity-type":"Typ encji", + "escalation-chain":"Łańcuch eskalacji", + "failed-send":"Błędy wysyłki", + "fails":"{ count, plural, =1 {1 błąd} other {# błędów} }", + "filter":"Filtr", + "first-recipient":"Pierwszy odbiorca", + "inactive":"Nieaktywne", + "inbox":"Skrzynka odbiorcza", + "notification-inbox":"Powiadomienia / Skrzynka odbiorcza", + "input-field-support-templatization":"Pole wejściowe obsługuje szablonowanie.", + "input-fields-support-templatization":"Pola wejściowe obsługują szablonowanie.", + "link":"Odnośnik", + "link-required":"Odnośnik jest wymagany", + "link-type":{ + "dashboard":"Otwórz pulpit nawigacyjny", + "link":"Otwórz link URL" + }, + "loading-notifications":"Ładowanie powiadomień...", + "management":"Zarządzanie powiadomieniami", + "mark-all-as-read":"Oznacz wszystkie jako przeczytane", + "mark-as-read":"Oznacz jako przeczytane", + "message":"Wiadomość", + "message-required":"Wiadomość jest wymagana", + "message-max-length":"Wiadomość powinna mieć mniej niż {{ length }} znaków", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana", + "new-notification":"Nowe powiadomienie", + "no-inbox-notification":"Nie znaleziono powiadomień", + "no-notification-request":"Brak zapytania o powiadomienie", + "no-notification-templates":"Nie znaleziono szablonów powiadomień", + "no-notifications-yet":"Brak powiadomień", + "no-recipients-notification":"Powiadomienie bez odbiorców", + "no-rule":"Nie skonfigurowano reguły", + "no-rules-notification":"Brak powiadomienia o regułach", + "no-severity-found":"Nie znaleziono powagi", + "no-severity-matching":"Nie znaleziono '{{severity}}'.", + "no-template-matching":"Nie znaleziono zasobów pasujących do '{{template}}'.", + "not-found-slack-recipient":"Nie znaleziono odbiorcy Slack", + "notification":"Powiadomienie", + "notification-center":"Centrum powiadomień", + "notify":"powiadomić", + "notify-again":"Powiadom ponownie", + "notify-alarm-action":{ + "acknowledged":"Alarm potwierdzony", + "assigned":"Alarm przypisany", + "cleared":"Alarm wyczyszczony", + "created":"Alarm utworzony", + "severity-changed":"Zmieniono powagę alarmu", + "unassigned":"Alarm nieprzypisany" + }, + "notify-on":"Powiadamiaj o", + "notify-on-comment-update":"Powiadamiaj o aktualizacji komentarza", + "notify-on-required":"Wymagane jest powiadomienie o", + "notify-on-unassign":"Powiadamiaj o cofnięciu przypisania", + "notify-only-user-comments":"Powiadamiaj tylko o komentarzach użytkownika", + "only-rule-chain-lifecycle-failures":"Tylko niepowodzenia cyklu życia łańcucha reguł", + "only-rule-node-lifecycle-failures":"Tylko niepowodzenia cyklu życia węzła reguły", + "platform-users":"Użytkownicy platformy", + "rate-limits":"Limity częstotliwości", + "rate-limits-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich limitów częstotliwości", + "recipient":"Odbiorca", + "recipient-group":"Grupa odbiorców", + "recipient-type":{ + "affected-tenant-administrators":"Dotknięci administratorzy najemcy", + "affected-user":"Dotknięty użytkownik", + "all-users":"Wszyscy użytkownicy", + "customer-users":"Użytkownicy klientów", + "system-administrators":"Administratorzy systemu", + "tenant-administrators":"Administratorzy najemcy", + "user-filters":"Filtr użytkowników", + "user-list":"Lista użytkowników", + "users-entity-owner":"Użytkownicy właściciela jednostki" + }, + "recipients":"Odbiorcy", + "notification-recipients":"Powiadomienia / Odbiorcy", + "recipients-count":"{ count, plural, =1 {1 odbiorca} other {# odbiorców} }", + "recipients-required":"Odbiorcy są wymagani", + "refresh-allow-delivery-method":"Odśwież metodę dostarczania", + "request-search":"Wyszukaj żądanie", + "request-status":{ + "processing":"Przetwarzanie", + "scheduled":"Zaplanowane", + "sent":"Wysłane" + }, + "review":"Recenzja", + "rule":"Reguła", + "rule-chain-list-rule-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich łańcuchów reguł", + "rule-engine-events-trigger-settings":"Ustawienia wyzwalaczy zdarzeń silnika reguł", + "rule-engine-filter":"Filtr silnika reguł", + "rule-name":"Nazwa reguły", + "rule-name-required":"Nazwa jest wymagana", + "rule-disable":"Wyłącz regułę powiadomienia", + "rule-enable":"Włącz regułę powiadomienia", + "rule-node-filter":"Filtr węzła reguły", + "rules":"Reguły", + "notification-rules":"Powiadomienia / Reguły", + "scheduler-later":"Zaplanuj na później", + "search-notification":"Wyszukaj powiadomienia", + "search-recipients":"Wyszukaj odbiorców", + "search-rules":"Wyszukaj reguły", + "search-templates":"Wyszukaj szablony", + "see-documentation":"Zobacz dokumentację", + "selected-notifications":"{ count, plural, =1 {1 powiadomienie} other {# powiadomień} } wybrano", + "selected-recipients":"{ count, plural, =1 {1 odbiorca} other {# odbiorców} } wybrano", + "selected-requests":"{ count, plural, =1 {1 żądanie} other {# żądań} } wybrano", + "selected-rules":"{ count, plural, =1 {1 reguła} other {# reguł} } wybrano", + "selected-template":"{ count, plural, =1 {1 szablon} other {# szablonów} } wybrano", + "send-notification":"Wyślij powiadomienie", + "sent":"Wysłane", + "notification-sent":"Powiadomienia / Wysłane", + "set-entity-from-notification":"Ustaw jednostkę z powiadomienia na stan pulpitu nawigacyjnego", + "slack-chanel-type":"Typ kanału Slack", + "slack-chanel-types":{ + "direct":"Wiadomość bezpośrednia", + "private-channel":"Prywatny kanał", + "public-channel":"Publiczny kanał" + }, + "start-from-scratch":"Rozpocznij od początku", + "status":"Status", + "stop-escalation-alarm-status-become":"Zatrzymaj eskalację, gdy status alarmu stanie się:", + "subject":"Temat", + "subject-required":"Temat jest wymagany", + "template":"Szablon", + "template-name":"Nazwa szablonu", + "template-required":"Szablon jest wymagany", + "template-type":{ + "alarm":"Alarm", + "alarm-assignment":"Przypisanie alarmu", + "alarm-comment":"Komentarz do alarmu", + "api-usage-limit":"Limit użycia API", + "device-activity":"Aktywność urządzenia", + "entities-limit":"Limit jednostek", + "entity-action":"Akcja jednostki", + "general":"Ogólny", + "rule-engine-lifecycle-event":"Zdarzenie cyklu życia silnika reguł", + "rule-node":"Węzeł reguły", + "new-platform-version":"Nowa wersja platformy", + "rate-limits":"Przekroczono limity częstotliwości" + }, + "templates":"Szablony", + "notification-templates":"Powiadomienia / Szablony", + "tenant-profiles-list-rule-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich profili najemców", + "tenants-list-rule-hint":"Jeśli pole jest puste, wyzwalacz zostanie zastosowany do wszystkich najemców", + "threshold":"Próg", + "theme-color":"Kolor motywu", + "time":"Czas", + "track-rule-node-events":"Śledź zdarzenia węzła reguły", + "trigger":{ + "alarm":"Alarm", + "alarm-assignment":"Przypisanie alarmu", + "alarm-comment":"Komentarz do alarmu", + "api-usage-limit":"Limit użycia API", + "device-activity":"Aktywność urządzenia", + "entities-limit":"Limit jednostek", + "entity-action":"Akcja jednostki", + "rule-engine-lifecycle-event":"Zdarzenie cyklu życia silnika reguł", + "new-platform-version":"Nowa wersja platformy", + "rate-limits":"Przekroczono limity częstotliwości", + "trigger":"Wyzwalacz", + "trigger-required":"Wymagany jest wyzwalacz" + }, + "type":"Typ", + "unread":"Nieprzeczytane", + "updated":"Zaktualizowane", + "use-template":"Użyj szablonu", + "view-all":"Pokaż wszystko", + "warning":"Ostrzeżenie", + "webhook-url":"URL Webhooka", + "webhook-url-required":"URL Webhooka jest wymagany", + "channel-name":"Nazwa kanału", + "channel-name-required":"Nazwa kanału jest wymagana", + "settings":{ + "notification-settings":"Ustawienia powiadomień", + "reset-all":"Zresetuj wszystkie ustawienia", + "reset-all-title":"Czy na pewno chcesz zresetować formularz?", + "reset-all-text":"Po potwierdzeniu, formularz ustawień zostanie zresetowany do domyślnej wartości i zapisany.", + "type":"Typ", + "enable-all":"Włącz wszystkie", + "disable-all":"Wyłącz wszystkie", + "delivery-not-configured":"Metoda dostarczania nie jest skonfigurowana" + } + }, + "ota-update":{ + "add":"Dodaj pakiet", + "assign-firmware":"Przypisane oprogramowanie", + "assign-firmware-required":"Przypisane oprogramowanie jest wymagane", + "assign-software":"Przypisane oprogramowanie", + "assign-software-required":"Przypisane oprogramowanie jest wymagane", + "auto-generate-checksum":"Automatycznie generuj sumę kontrolną", + "checksum":"Suma kontrolna", + "checksum-hint":"Jeśli suma kontrolna jest pusta, zostanie wygenerowana automatycznie", + "checksum-algorithm":"Algorytm sumy kontrolnej", + "checksum-copied-message":"Suma kontrolna pakietu została skopiowana do schowka", + "change-firmware":"Zmiana oprogramowania może spowodować aktualizację { count, plural, =1 {1 urządzenia} other {# urządzeń} }.", + "change-software":"Zmiana oprogramowania może spowodować aktualizację { count, plural, =1 {1 urządzenia} other {# urządzeń} }.", + "chose-compatible-device-profile":"Wgrany pakiet będzie dostępny tylko dla urządzeń z wybranym profilem.", + "chose-firmware-distributed-device":"Wybierz oprogramowanie, które zostanie rozprowadzone na urządzenia", + "chose-software-distributed-device":"Wybierz oprogramowanie, które zostanie rozprowadzone na urządzenia", + "content-type":"Typ zawartości", + "copy-checksum":"Kopiuj sumę kontrolną", + "copy-direct-url":"Kopiuj bezpośredni adres URL", + "copyId":"Kopiuj identyfikator pakietu", + "copied":"Skopiowane!", + "delete":"Usuń pakiet", + "delete-ota-update-text":"Bądź ostrożny, po potwierdzeniu aktualizacja OTA stanie się nieodwracalna.", + "delete-ota-update-title":"Czy na pewno chcesz usunąć aktualizację OTA „{{title}}”?", + "delete-ota-updates-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane aktualizacje OTA zostaną usunięte.", + "delete-ota-updates-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 aktualizację OTA} other {# aktualizacji OTA} }?", + "description":"Opis", + "direct-url":"Bezpośredni adres URL", + "direct-url-copied-message":"Bezpośredni adres URL pakietu został skopiowany do schowka", + "direct-url-required":"Bezpośredni adres URL jest wymagany", + "download":"Pobierz pakiet", + "drop-file":"Przeciągnij i upuść plik pakietu lub kliknij, aby wybrać plik do przesłania.", + "drop-package-file-or":"Przeciągnij i upuść plik pakietu lub", + "file-name":"Nazwa pliku", + "file-size":"Rozmiar pliku", + "file-size-bytes":"Rozmiar pliku w bajtach", + "idCopiedMessage":"Identyfikator pakietu został skopiowany do schowka", + "no-firmware-matching":"Nie znaleziono kompatybilnych pakietów aktualizacji oprogramowania układowego pasujących do „{{entity}}”.", + "no-firmware-text":"Brak kompatybilnych pakietów aktualizacji oprogramowania układowego.", + "no-packages-text":"Nie znaleziono pakietów", + "no-software-matching":"Nie znaleziono kompatybilnych pakietów aktualizacji oprogramowania pasujących do „{{entity}}”.", + "no-software-text":"Brak kompatybilnych pakietów aktualizacji oprogramowania.", + "ota-update":"Aktualizacja OTA", + "ota-update-details":"Szczegóły aktualizacji OTA", + "ota-updates":"Aktualizacje OTA", + "package-file":"Plik pakietu", + "package-type":"Typ pakietu", + "packages-repository":"Repozytorium pakietów", + "search":"Szukaj pakietów", + "selected-package":"{ count, plural, =1 {1 pakiet} other {# pakietów} } wybrano", + "title":"Tytuł", + "title-required":"Tytuł jest wymagany.", + "title-max-length":"Tytuł powinien mieć mniej niż 256", + "types":{ + "firmware":"Oprogramowanie układowe", + "software":"Oprogramowanie" + }, + "upload-binary-file":"Prześlij plik binarny", + "use-external-url":"Użyj zewnętrznego adresu URL", + "version":"Wersja", + "version-required":"Wersja jest wymagana.", + "version-tag":"Tag wersji", + "version-tag-hint":"Niestandardowy tag powinien pasować do wersji pakietu zgłoszonej przez Twoje urządzenie.", + "version-max-length":"Wersja powinna mieć mniej niż 256", + "warning-after-save-no-edit":"Po przesłaniu pakietu nie będziesz mógł edytować tytułu, wersji, profilu urządzenia i typu pakietu." + }, + "position":{ + "top":"Góra", + "bottom":"Dół", + "left":"Lewo", + "right":"Prawo" + }, + "profile":{ + "profile":"Profil", + "last-login-time":"Ostatnie logowanie", + "change-password":"Zmień hasło", + "current-password":"Obecne hasło", + "copy-jwt-token":"Kopiuj token JWT", + "jwt-token":"Token JWT", + "token-valid-till":"Token jest ważny do", + "tokenCopiedSuccessMessage":"Token JWT został skopiowany do schowka", + "tokenCopiedWarnMessage":"Token JWT wygasł! Proszę odświeżyć stronę." + }, + "profiles":{ + "profiles":"Profile" + }, + "security":{ + "security":"Bezpieczeństwo", + "general-settings":"Ogólne ustawienia bezpieczeństwa", + "access-token":"Token dostępu", + "access-token-required":"Token dostępu jest wymagany", + "clientId":"ID klienta", + "clientId-required":"ID klienta jest wymagane", + "username":"Nazwa użytkownika", + "username-required":"Nazwa użytkownika jest wymagana", + "ca-cert":"Certyfikat CA", + "2fa":{ + "2fa":"Uwierzytelnianie dwuskładnikowe", + "2fa-description":"Uwierzytelnianie dwuskładnikowe chroni Twoje konto przed nieautoryzowanym dostępem. Wystarczy wprowadzić kod zabezpieczeń podczas logowania.", + "authenticate-with":"Możesz uwierzytelniać się za pomocą:", + "disable-2fa-provider-text":"Wyłączenie {{name}} spowoduje obniżenie poziomu bezpieczeństwa Twojego konta", + "disable-2fa-provider-title":"Czy na pewno chcesz wyłączyć {{name}}?", + "get-new-code":"Pobierz nowy kod", + "main-2fa-method":"Użyj jako główna metoda uwierzytelniania dwuskładnikowego", + "dialog":{ + "activation-step-description-email":"Następnym razem, gdy się zalogujesz, zostaniesz poproszony o wprowadzenie kodu zabezpieczeń, który zostanie wysłany na Twój adres e-mail.", + "activation-step-description-sms":"Następnym razem, gdy się zalogujesz, zostaniesz poproszony o wprowadzenie kodu zabezpieczeń, który zostanie wysłany na numer telefonu.", + "activation-step-description-totp":"Następnym razem, gdy się zalogujesz, będziesz musiał wprowadzić kod uwierzytelniania dwuskładnikowego.", + "activation-step-label":"Aktywacja", + "backup-code-description":"Wydrukuj kody, aby mieć je pod ręką, gdy będziesz musiał ich użyć do zalogowania się na swoje konto. Każdy kod zapasowy można użyć tylko raz.", + "backup-code-warn":"Po opuszczeniu tej strony te kody nie będą już dostępne. Przechowuj je bezpiecznie, korzystając z dostępnych opcji poniżej.", + "download-txt":"Pobierz (txt)", + "email-step-description":"Podaj adres e-mail, który będziesz używać jako autentykatora.", + "email-step-label":"E-mail", + "enable-email-title":"Włącz autentykator e-mail", + "enable-sms-title":"Włącz autentykator SMS", + "enable-totp-title":"Włącz autentykator aplikacji", + "enter-verification-code":"Wprowadź tutaj 6-cyfrowy kod", + "get-backup-code-title":"Pobierz kod zapasowy", + "next":"Dalej", + "scan-qr-code":"Zeskanuj ten kod QR za pomocą swojej aplikacji uwierzytelniającej", + "send-code":"Wyślij kod", + "sms-step-description":"Podaj numer telefonu, który będziesz używać jako autentykatora.", + "sms-step-label":"Numer telefonu", + "success":"Sukces!", + "totp-step-description-install":"Możesz zainstalować aplikacje takie jak Google Authenticator, Authy lub Duo.", + "totp-step-description-open":"Otwórz aplikację autentykatora na swoim telefonie komórkowym.", + "totp-step-label":"Pobierz aplikację", + "verification-code":"Kod weryfikacyjny 6-cyfrowy", + "verification-code-invalid":"Nieprawidłowy format kodu weryfikacyjnego", + "verification-code-incorrect":"Kod weryfikacyjny jest niepoprawny", + "verification-code-many-request":"Zbyt wiele żądań sprawdzenia kodu weryfikacyjnego", + "verification-step-description":"Wprowadź 6-cyfrowy kod, który właśnie wysłaliśmy na adres {{address}}", + "verification-step-label":"Weryfikacja" + }, + "provider":{ + "email":"E-mail", + "email-description":"Użyj kodu zabezpieczeń wysłanego na Twój adres e-mail do uwierzytelniania.", + "email-hint":"Kody uwierzytelniania są wysyłane przez e-mail na adres {{ info }}", + "sms":"SMS", + "sms-description":"Użyj telefonu do uwierzytelniania. Wyślemy Ci kod zabezpieczeń za pomocą wiadomości SMS podczas logowania.", + "sms-hint":"Kody uwierzytelniania są wysyłane jako wiadomości tekstowe na numer telefonu {{ info }}", + "totp":"Aplikacja autentykatora", + "totp-description":"Używaj aplikacji takich jak Google Authenticator, Authy lub Duo na swoim telefonie do uwierzytelniania. Wygeneruje ona kod zabezpieczeń do logowania.", + "totp-hint":"Aplikacja autentykatora jest skonfigurowana dla Twojego konta", + "backup_code":"Kod zapasowy", + "backup-code-description":"Te jednorazowe kody do wydruku pozwalają Ci się zalogować, gdy jesteś z dala od telefonu, na przykład podczas podróży.", + "backup-code-hint":"Obecnie aktywnych jest {{ info }} jednorazowych kodów" + } + }, + "password-requirement":{ + "at-least":"Przynajmniej:", + "character":"{ count, plural, =1 {1 znak} other {# znaków} }", + "digit":"{ count, plural, =1 {1 cyfra} other {# cyfr} }", + "incorrect-password-try-again":"Nieprawidłowe hasło. Spróbuj ponownie", + "lowercase-letter":"{ count, plural, =1 {1 mała litera} other {# małe litery} }", + "new-passwords-not-match":"Nowe hasło nie pasuje", + "password-should-not-contain-spaces":"Twoje hasło nie powinno zawierać spacji", + "password-not-meet-requirements":"Hasło nie spełnia wymagań", + "password-requirements":"Wymagania dotyczące hasła", + "password-should-difference":"Nowe hasło powinno różnić się od bieżącego", + "special-character":"{ count, plural, =1 {1 znak specjalny} other {# znaków specjalnych} }", + "uppercase-letter":"{ count, plural, =1 {1 wielka litera} other {# wielkie litery} }", + "at-most":"Maksymalnie:" + } + }, + "relation":{ + "relations":"Relacje", + "direction":"Kierunek", + "clear-relation-type":"Wyczyść typ relacji", + "search-direction":{ + "FROM":"Od", + "TO":"Do" + }, + "direction-type":{ + "FROM":"from", + "TO":"to" + }, + "from-relations":"Wychodzące relacje", + "to-relations":"Przychodzące relacje", + "selected-relations":"{ count, plural, =1 {1 relacja} other {# relacji} } wybrano", + "type":"Typ", + "to-entity-type":"Typ jednostki docelowej", + "to-entity-name":"Nazwa jednostki docelowej", + "from-entity-type":"Typ jednostki źródłowej", + "from-entity-name":"Nazwa jednostki źródłowej", + "to-entity":"Jednostka docelowa", + "from-entity":"Jednostka źródłowa", + "delete":"Usuń relację", + "relation-type":"Typ relacji", + "relation-type-required":"Wymagany jest typ relacji.", + "relation-type-max-length":"Typ relacji powinien mieć mniej niż 256 znaków", + "any-relation-type":"Dowolny typ", + "add":"Dodaj relację", + "edit":"Edytuj relację", + "delete-to-relation-title":"Czy na pewno chcesz usunąć relację do jednostki '{{entityName}}'?", + "delete-to-relation-text":"Bądź ostrożny, po potwierdzeniu jednostka '{{entityName}}' zostanie odłączona od bieżącej jednostki.", + "delete-to-relations-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 relacja} other {# relacje} }?", + "delete-to-relations-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane relacje zostaną usunięte, a odpowiednie jednostki zostaną odłączone od bieżącej jednostki.", + "delete-from-relation-title":"Czy na pewno chcesz usunąć relację z jednostki '{{entityName}}'?", + "delete-from-relation-text":"Bądź ostrożny, po potwierdzeniu bieżąca jednostka zostanie odłączona od jednostki '{{entityName}}'.", + "delete-from-relations-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 relacja} other {# relacje} }?", + "delete-from-relations-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane relacje zostaną usunięte, a bieżąca jednostka zostanie odłączona od odpowiednich jednostek.", + "remove-relation-filter":"Usuń filtr relacji", + "remove-filter":"Usuń filtr", + "add-relation-filter":"Dodaj filtr relacji", + "any-relation":"Dowolna relacja", + "relation-filters":"Filtry relacji", + "additional-info":"Dodatkowe informacje (JSON)", + "invalid-additional-info":"Nie można sparsować dodatkowych informacji json.", + "no-relations-text":"Nie znaleziono relacji" + }, + "resource":{ + "add":"Dodaj zasób", + "all-types":"Wszystkie", + "copyId":"Skopiuj identyfikator zasobu", + "delete":"Usuń zasób", + "delete-resource-text":"Bądź ostrożny, po potwierdzeniu zasób zostanie bezpowrotnie usunięty.", + "delete-resource-title":"Czy na pewno chcesz usunąć zasób '{{resourceTitle}}'?", + "delete-resources-action-title":"Usuń { count, plural, =1 {1 zasób} other {# zasobów} }", + "delete-resources-text":"Proszę zauważyć, że wybrane zasoby, nawet jeśli są używane w profilach urządzeń, zostaną usunięte.", + "delete-resources-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 zasób} other {# zasobów} }?", + "download":"Pobierz zasób", + "drop-file":"Upuść plik zasobu lub kliknij, aby wybrać plik do przesłania.", + "drop-resource-file-or":"Przeciągnij i upuść plik zasobu lub", + "empty":"Zasób jest pusty", + "file-name":"Nazwa pliku", + "idCopiedMessage":"Identyfikator zasobu został skopiowany do schowka", + "no-resource-matching":"Nie znaleziono zasobów pasujących do '{{widgetsBundle}}'.", + "no-resource-text":"Nie znaleziono zasobów", + "open-widgets-bundle":"Otwórz paczkę widżetów", + "resource":"Zasób", + "resource-file":"Plik zasobu", + "resource-files":"Pliki zasobów", + "resource-library-details":"Szczegóły zasobu", + "resource-type":"Typ zasobu", + "resources-library":"Biblioteka zasobów", + "search":"Szukaj zasobów", + "selected-resources":"{ count, plural, =1 {1 zasób} other {# zasobów} } wybrano", + "system":"System", + "title":"Tytuł", + "title-required":"Tytuł jest wymagany.", + "title-max-length":"Tytuł powinien mieć mniej niż 256 znaków", + "type":{ + "jks":"JKS", + "js-module":"Moduł JS", + "lwm2m-model":"Model LWM2M", + "pkcs-12":"PKCS #12" + } + }, + "rulechain":{ + "rulechain":"Łańcuch reguł", + "rulechain-events":"Zdarzenia łańcucha reguł", + "rulechains":"Łańcuchy reguł", + "root":"Korzeń", + "delete":"Usuń łańcuch reguł", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "name-max-length":"Nazwa powinna mieć mniej niż 256 znaków", + "description":"Opis", + "add":"Dodaj łańcuch reguł", + "set-root":"Ustaw łańcuch reguł jako korzeń", + "set-root-rulechain-title":"Jesteś pewien, że chcesz ustawić łańcuch reguł '{{ruleChainName}}' jako korzeń?", + "set-root-rulechain-text":"Po potwierdzeniu łańcuch reguł stanie się korzeniem i będzie obsługiwał wszystkie przychodzące wiadomości transportowe.", + "delete-rulechain-title":"Jesteś pewien, że chcesz usunąć łańcuch reguł '{{ruleChainName}}'?", + "delete-rulechain-text":"Bądź ostrożny, po potwierdzeniu łańcuch reguł i wszystkie powiązane dane staną się nieodwracalne.", + "delete-rulechains-title":"Jesteś pewien, że chcesz usunąć { count, plural, =1 {1 łańcuch reguł} other {# łańcuchów reguł} }?", + "delete-rulechains-action-title":"Usuń { count, plural, =1 {1 łańcuch reguł} other {# łańcuchów reguł} }", + "delete-rulechains-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane łańcuchy reguł zostaną usunięte, a wszystkie powiązane dane staną się nieodwracalne.", + "add-rulechain-text":"Dodaj nowy łańcuch reguł", + "no-rulechains-text":"Nie znaleziono łańcuchów reguł", + "rulechain-details":"Szczegóły łańcucha reguł", + "details":"Szczegóły", + "events":"Zdarzenia", + "system":"System", + "import":"Importuj łańcuch reguł", + "export":"Eksportuj łańcuch reguł", + "export-failed-error":"Nie można wyeksportować łańcucha reguł: {{error}}", + "create-new-rulechain":"Utwórz nowy łańcuch reguł", + "rulechain-file":"Plik łańcucha reguł", + "invalid-rulechain-file-error":"Nie można zaimportować łańcucha reguł: Nieprawidłowa struktura danych łańcucha reguł.", + "copyId":"Skopiuj identyfikator łańcucha reguł", + "idCopiedMessage":"Identyfikator łańcucha reguł został skopiowany do schowka", + "select-rulechain":"Wybierz łańcuch reguł", + "no-rulechains-matching":"Nie znaleziono łańcuchów reguł pasujących do '{{entity}}'.", + "rulechain-required":"Łańcuch reguł jest wymagany", + "management":"Zarządzanie regułami", + "debug-mode":"Tryb debugowania", + "search":"Wyszukaj łańcuchy reguł", + "selected-rulechains":"{ count, plural, =1 {1 łańcuch reguł} other {# łańcuchów reguł} } wybranych", + "open-rulechain":"Otwórz łańcuch reguł", + "edge-template-root":"Korzeń szablonu", + "assign-to-edge":"Przypisz do krawędzi", + "edge-rulechain":"Łańcuch reguł krawędzi", + "unassign-rulechain-from-edge-text":"Po potwierdzeniu łańcuch reguł zostanie odłączony i nie będzie dostępny dla krawędzi.", + "unassign-rulechains-from-edge-title":"Jesteś pewien, że chcesz odłączyć { count, plural, =1 {1 łańcuch reguł} other {# łańcuchów reguł} }?", + "unassign-rulechains-from-edge-text":"Po potwierdzeniu wszystkie wybrane łańcuchy reguł zostaną odłączone i nie będą dostępne dla krawędzi.", + "assign-rulechain-to-edge-title":"Przypisz łańcuch(y) reguł do krawędzi", + "assign-rulechain-to-edge-text":"Wybierz łańcuchy reguł do przypisania do krawędzi", + "set-edge-template-root-rulechain":"Ustaw łańcuch reguł jako korzeń szablonu krawędzi", + "set-edge-template-root-rulechain-title":"Jesteś pewien, że chcesz ustawić łańcuch reguł '{{ruleChainName}}' jako korzeń szablonu krawędzi?", + "set-edge-template-root-rulechain-text":"Po potwierdzeniu łańcuch reguł stanie się korzeniem szablonu krawędzi i będzie korzeniem łańcucha reguł dla nowo tworzonych krawędzi.", + "invalid-rulechain-type-error":"Nie można zaimportować łańcucha reguł: Nieprawidłowy typ łańcucha reguł. Oczekiwany typ to {{expectedRuleChainType}}.", + "set-auto-assign-to-edge":"Przypisz łańcuch reguł do krawędzi podczas tworzenia", + "set-auto-assign-to-edge-title":"Jesteś pewien, że chcesz przypisać łańcuch reguł krawędzi '{{ruleChainName}}' do krawędzi podczas tworzenia?", + "set-auto-assign-to-edge-text":"Po potwierdzeniu łańcuch reguł krawędzi zostanie automatycznie przypisany do krawędzi podczas tworzenia.", + "unset-auto-assign-to-edge":"Nie przypisuj łańcucha reguł do krawędzi podczas tworzenia", + "unset-auto-assign-to-edge-title":"Jesteś pewien, że nie chcesz przypisywać łańcucha reguł krawędzi '{{ruleChainName}}' do krawędzi podczas tworzenia?", + "unset-auto-assign-to-edge-text":"Po potwierdzeniu łańcuch reguł krawędzi nie będzie automatycznie przypisywany do krawędzi podczas tworzenia.", + "unassign-rulechain-title":"Jesteś pewien, że chcesz odłączyć łańcuch reguł '{{ruleChainName}}'?", + "unassign-rulechains":"Odłącz łańcuchy reguł" + }, + "rulenode":{ + "rule-node-events":"Zdarzenia węzła reguły", + "details":"Szczegóły", + "events":"Zdarzenia", + "search":"Wyszukaj węzły", + "open-node-library":"Otwórz bibliotekę węzłów", + "close-node-library":"Zamknij bibliotekę węzłów", + "add":"Dodaj węzeł reguły", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "name-max-length":"Nazwa powinna mieć mniej niż 256 znaków", + "type":"Typ", + "rule-node-description":"Opis węzła reguły", + "delete":"Usuń węzeł reguły", + "select-all-objects":"Zaznacz wszystkie węzły i połączenia", + "deselect-all-objects":"Odznacz wszystkie węzły i połączenia", + "delete-selected-objects":"Usuń wybrane węzły i połączenia", + "delete-selected":"Usuń zaznaczone", + "create-nested-rulechain":"Utwórz zagnieżdżony łańcuch reguł", + "select-all":"Zaznacz wszystkie", + "copy-selected":"Skopiuj zaznaczone", + "deselect-all":"Odznacz wszystkie", + "rulenode-details":"Szczegóły węzła reguły", + "debug-mode":"Tryb debugowania", + "singleton-mode":"Tryb pojedynczej instancji", + "configuration":"Konfiguracja", + "link":"Połączenie", + "link-details":"Szczegóły połączenia węzła reguły", + "add-link":"Dodaj połączenie", + "link-label":"Etykieta połączenia", + "link-label-required":"Etykieta połączenia jest wymagana.", + "custom-link-label":"Niestandardowa etykieta połączenia", + "custom-link-label-required":"Niestandardowa etykieta połączenia jest wymagana.", + "link-labels":"Etykiety połączeń", + "link-labels-required":"Wymagane są etykiety połączeń.", + "no-link-labels-found":"Nie znaleziono etykiet połączeń", + "no-link-label-matching":"'{{label}}' nie zostało znalezione.", + "create-new-link-label":"Utwórz nową!", + "type-filter":"Filtr", + "type-filter-details":"Filtruj przychodzące wiadomości z określonymi warunkami", + "type-enrichment":"Wzbogacenie", + "type-enrichment-details":"Dodaj dodatkowe informacje do metadanych wiadomości", + "type-transformation":"Transformacja", + "type-transformation-details":"Zmień ładunek wiadomości i metadane", + "type-action":"Akcja", + "type-action-details":"Wykonaj specjalną akcję", + "type-external":"Zewnętrzne", + "type-external-details":"Komunikuje się z zewnętrznym systemem", + "type-rule-chain":"Łańcuch reguł", + "type-rule-chain-details":"Przekazuje przychodzące wiadomości do określonego łańcucha reguł", + "type-flow":"Przepływ", + "type-flow-details":"Organizuje przepływ wiadomości", + "type-input":"Wejście", + "type-input-details":"Logiczne wejście łańcucha reguł, przekazuje przychodzące wiadomości do następnego powiązanego węzła reguły", + "type-unknown":"Nieznany", + "type-unknown-details":"Nierozwiązany węzeł reguły", + "directive-is-not-loaded":"Zdefiniowana dyrektywa konfiguracji '{{directiveName}}' nie jest dostępna.", + "ui-resources-load-error":"Nie udało się załadować zasobów interfejsu użytkownika konfiguracji.", + "invalid-target-rulechain":"Nie można rozpoznać docelowego łańcucha reguł!", + "test-script-function":"Funkcja skryptu testowego", + "script-lang-java-script":"JavaScript", + "script-lang-tbel":"TBEL", + "message":"Wiadomość", + "message-type":"Typ wiadomości", + "select-message-type":"Wybierz typ wiadomości", + "message-type-required":"Wymagany jest typ wiadomości", + "metadata":"Metadane", + "metadata-required":"Wpisy metadanych nie mogą być puste.", + "output":"Wynik", + "test":"Test", + "help":"Pomoc", + "reset-debug-mode":"Zresetuj tryb debugowania we wszystkich węzłach", + "test-with-this-message":"{{test}} z tą wiadomością", + "queue-hint":"Wybierz kolejkę do przekazywania wiadomości do innej kolejki. Domyślnie używana jest kolejka „Main”.", + "queue-singleton-hint":"Wybierz kolejkę do przekazywania wiadomości w środowiskach wielu instancji. Domyślnie używana jest kolejka „Main”." + }, + "timezone":{ + "timezone":"Strefa czasowa", + "select-timezone":"Wybierz strefę czasową", + "no-timezones-matching":"Nie znaleziono stref czasowych pasujących do '{{timezone}}'.", + "timezone-required":"Strefa czasowa jest wymagana.", + "browser-time":"Czas przeglądarki" + }, + "queue":{ + "queue-name":"Kolejka", + "no-queues-found":"Nie znaleziono kolejek.", + "no-queues-matching":"Nie znaleziono kolejek pasujących do '{{queue}}'.", + "select-name":"Wybierz nazwę kolejki", + "name":"Nazwa", + "name-required":"Nazwa kolejki jest wymagana!", + "name-unique":"Nazwa kolejki nie jest unikalna!", + "name-pattern":"Nazwa kolejki zawiera znak inny niż alfanumeryczny ASCII, '.', '_', i '-'!", + "queue-required":"Kolejka jest wymagana!", + "topic-required":"Temat kolejki jest wymagany!", + "poll-interval-required":"Interwał odpytywania jest wymagany!", + "poll-interval-min-value":"Wartość interwału odpytywania nie może być mniejsza niż 1", + "partitions-required":"Partycje są wymagane!", + "partitions-min-value":"Wartość partycji nie może być mniejsza niż 1", + "pack-processing-timeout-required":"Limit czasu przetwarzania jest wymagany", + "pack-processing-timeout-min-value":"Wartość limitu czasu przetwarzania nie może być mniejsza niż 1", + "batch-size-required":"Rozmiar partii jest wymagany!", + "batch-size-min-value":"Wartość rozmiaru partii nie może być mniejsza niż 1", + "retries-required":"Liczba prób jest wymagana!", + "retries-min-value":"Wartość liczby prób nie może być ujemna", + "failure-percentage-required":"Procent awaryjnych wiadomości jest wymagany!", + "failure-percentage-min-value":"Wartość procenta awaryjnych wiadomości nie może być mniejsza niż 0", + "failure-percentage-max-value":"Wartość procenta awaryjnych wiadomości nie może być większa niż 100", + "pause-between-retries-required":"Odstęp między próbami jest wymagany!", + "pause-between-retries-min-value":"Wartość odstępu między próbami nie może być mniejsza niż 1", + "max-pause-between-retries-required":"Maksymalny odstęp między próbami jest wymagany!", + "max-pause-between-retries-min-value":"Wartość maksymalnego odstępu między próbami nie może być mniejsza niż 1", + "submit-strategy-type-required":"Typ strategii przesyłania jest wymagany!", + "processing-strategy-type-required":"Typ strategii przetwarzania jest wymagany!", + "queues":"Kolejki", + "selected-queues":"{ count, plural, =1 {1 kolejka} other {# kolejek} } wybranych", + "delete-queue-title":"Czy na pewno chcesz usunąć kolejkę '{{queueName}}'?", + "delete-queues-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 kolejkę} other {# kolejki} }?", + "delete-queue-text":"Bądź ostrożny, po potwierdzeniu kolejka i wszystkie związane z nią dane zostaną bezpowrotnie usunięte.", + "delete-queues-text":"Po potwierdzeniu wszystkie wybrane kolejki zostaną usunięte i nie będą dostępne.", + "search":"Wyszukaj kolejkę", + "add":"Dodaj kolejkę", + "details":"Szczegóły kolejki", + "topic":"Temat", + "submit-settings":"Ustawienia przesyłania", + "submit-strategy":"Typ strategii *", + "grouping-parameter":"Parametr grupowania", + "processing-settings":"Ustawienia przetwarzania", + "processing-strategy":"Typ przetwarzania *", + "retries-settings":"Ustawienia prób", + "polling-settings":"Ustawienia odpytywania", + "batch-processing":"Przetwarzanie partiami", + "poll-interval":"Interwał odpytywania", + "partitions":"Partycje", + "immediate-processing":"Natychmiastowe przetwarzanie", + "consumer-per-partition":"Wysyłaj odpytywanie dla każdego konsumenta", + "consumer-per-partition-hint":"Włącz oddzielnych konsumentów dla każdej partycji", + "processing-timeout":"Przetwarzaj w ciągu, ms", + "batch-size":"Rozmiar partii", + "retries":"Liczba prób (0 - nieograniczona)", + "failure-percentage":"Procent awaryjnych wiadomości do pominięcia prób", + "pause-between-retries":"Odstęp między próbami, s", + "max-pause-between-retries":"Maksymalny odstęp między próbami, s", + "delete":"Usuń kolejkę", + "copyId":"Skopiuj Id kolejki", + "idCopiedMessage":"Id kolejki zostało skopiowane do schowka", + "description":"Opis", + "description-hint":"Ten tekst będzie wyświetlany w opisie kolejki zamiast wybranej strategii", + "alt-description":"Strategia przesyłania: {{submitStrategy}}, Strategia przetwarzania: {{processingStrategy}}", + "custom-properties":"Własne właściwości", + "custom-properties-hint":"Własne właściwości tworzenia kolejki (tematu), np. 'retention.ms:604800000;retention.bytes:1048576000'", + "strategies":{ + "sequential-by-originator-label":"Sekwencyjne według nadawcy", + "sequential-by-originator-hint":"Nowa wiadomość, na przykład dla urządzenia A, nie jest przesyłana, dopóki poprzednia wiadomość dla urządzenia A nie zostanie potwierdzona", + "sequential-by-tenant-label":"Sekwencyjne według najemcy", + "sequential-by-tenant-hint":"Nowa wiadomość, na przykład dla najemcy A, nie jest przesyłana, dopóki poprzednia wiadomość dla najemcy A nie zostanie potwierdzona", + "sequential-label":"Sekwencyjne", + "sequential-hint":"Nowa wiadomość nie jest przesyłana, dopóki poprzednia wiadomość nie zostanie potwierdzona", + "burst-label":"Burst", + "burst-hint":"Wszystkie wiadomości są przesyłane do łańcuchów reguł w kolejności ich przyjścia", + "batch-label":"Partia", + "batch-hint":"Nowa partia nie jest przesyłana, dopóki poprzednia partia nie zostanie potwierdzona", + "skip-all-failures-label":"Pomiń wszystkie awarie", + "skip-all-failures-hint":"Ignoruj wszystkie awarie", + "skip-all-failures-and-timeouts-label":"Pomiń wszystkie awarie i przerwy czasowe", + "skip-all-failures-and-timeouts-hint":"Ignoruj wszystkie awarie i przerwy czasowe", + "retry-all-label":"Ponów wszystkie", + "retry-all-hint":"Ponów wszystkie wiadomości z pakietu przetwarzania", + "retry-failed-label":"Ponów nieudane", + "retry-failed-hint":"Ponów wszystkie nieudane wiadomości z pakietu przetwarzania", + "retry-timeout-label":"Ponów przerwę czasową", + "retry-timeout-hint":"Ponów wszystkie wiadomości przekroczone czasem z pakietu przetwarzania", + "retry-failed-and-timeout-label":"Ponów nieudane i przerwę czasową", + "retry-failed-and-timeout-hint":"Ponów wszystkie nieudane i przekroczone czasem wiadomości z pakietu przetwarzania" + } + }, + "server-error":{ + "general":"Ogólny błąd serwera", + "authentication":"Błąd uwierzytelniania", + "jwt-token-expired":"Token JWT wygasł", + "tenant-trial-expired":"Próba najemcy wygasła", + "credentials-expired":"Wygasły poświadczenia", + "permission-denied":"Brak uprawnień", + "invalid-arguments":"Nieprawidłowe argumenty", + "bad-request-params":"Nieprawidłowe parametry żądania", + "item-not-found":"Nie znaleziono elementu", + "too-many-requests":"Zbyt wiele żądań", + "too-many-updates":"Zbyt wiele aktualizacji" + }, + "tenant":{ + "tenant":"Najemca", + "tenants":"Najemcy", + "management":"Zarządzanie najemcami", + "add":"Dodaj najemcę", + "admins":"Administratorzy", + "manage-tenant-admins":"Zarządzaj administratorami najemcy", + "delete":"Usuń najemcę", + "add-tenant-text":"Dodaj nowego najemcę", + "no-tenants-text":"Nie znaleziono najemców", + "tenant-details":"Szczegóły najemcy", + "title-max-length":"Tytuł powinien zawierać mniej niż 256 znaków", + "delete-tenant-title":"Czy na pewno chcesz usunąć najemcę '{{tenantTitle}}'?", + "delete-tenant-text":"Bądź ostrożny, po potwierdzeniu najemca i wszystkie związane z nim dane zostaną bezpowrotnie usunięte.", + "delete-tenants-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 najemcę} other {# najemców} }?", + "delete-tenants-action-title":"Usuń { count, plural, =1 {1 najemcę} other {# najemców} }", + "delete-tenants-text":"Bądź ostrożny, po potwierdzeniu wszyscy wybrani najemcy zostaną usunięci, a wszystkie związane z nimi dane zostaną bezpowrotnie usunięte.", + "title":"Tytuł", + "title-required":"Tytuł jest wymagany.", + "description":"Opis", + "details":"Szczegóły", + "events":"Zdarzenia", + "copyId":"Kopiuj Id najemcy", + "idCopiedMessage":"Id najemcy zostało skopiowane do schowka", + "select-tenant":"Wybierz najemcę", + "no-tenants-matching":"Nie znaleziono najemców pasujących do '{{entity}}'", + "tenant-required":"Najemca jest wymagany", + "search":"Szukaj najemców", + "selected-tenants":"{ count, plural, =1 {1 najemca} other {# najemcy} } wybrano", + "isolated-tb-rule-engine":"Użyj izolowanych kolejek ThingsBoard Rule Engine", + "isolated-tb-rule-engine-details":"Każdy najemca będzie miał dedykowane kolejki Rule Engine" + }, + "tenant-profile":{ + "tenant-profile":"Profil najemcy", + "tenant-profiles":"Profile najemców", + "add":"Dodaj profil najemcy", + "add-profile":"Dodaj profil", + "edit":"Edytuj profil najemcy", + "tenant-profile-details":"Szczegóły profilu najemcy", + "no-tenant-profiles-text":"Nie znaleziono profili najemców", + "name-max-length":"Nazwa powinna zawierać mniej niż 256 znaków", + "search":"Szukaj profili najemców", + "selected-tenant-profiles":"{ count, plural, =1 {1 profil najemcy} other {# profile najemców} } wybrano", + "no-tenant-profiles-matching":"Nie znaleziono profili najemców pasujących do '{{entity}}'", + "tenant-profile-required":"Profil najemcy jest wymagany", + "idCopiedMessage":"Id profilu najemcy zostało skopiowane do schowka", + "set-default":"Ustaw profil najemcy jako domyślny", + "delete":"Usuń profil najemcy", + "copyId":"Kopiuj Id profilu najemcy", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "data":"Dane profilu", + "profile-configuration":"Konfiguracja profilu", + "description":"Opis", + "default":"Domyślny", + "delete-tenant-profile-title":"Czy na pewno chcesz usunąć profil najemcy '{{tenantProfileName}}'?", + "delete-tenant-profile-text":"Bądź ostrożny, po potwierdzeniu profil najemcy i wszystkie związane z nim dane zostaną bezpowrotnie usunięte.", + "delete-tenant-profiles-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 profil najemcy} other {# profile najemców} }?", + "delete-tenant-profiles-text":"Bądź ostrożny, po potwierdzeniu wszystkie wybrane profile najemców zostaną usunięte, a wszystkie związane z nimi dane zostaną bezpowrotnie usunięte.", + "set-default-tenant-profile-title":"Czy na pewno chcesz ustawić profil najemcy '{{tenantProfileName}}' jako domyślny?", + "set-default-tenant-profile-text":"Po potwierdzeniu profil najemcy zostanie oznaczony jako domyślny i będzie używany dla nowych najemców bez określonego profilu.", + "no-tenant-profiles-found":"Nie znaleziono profili najemców.", + "create-new-tenant-profile":"Utwórz nowy!", + "create-tenant-profile":"Utwórz nowy profil najemcy", + "import":"Importuj profil najemcy", + "export":"Eksportuj profil najemcy", + "export-failed-error":"Nie można wyeksportować profilu najemcy: {{error}}", + "tenant-profile-file":"Plik profilu najemcy", + "invalid-tenant-profile-file-error":"Nie można zaimportować profilu najemcy: Nieprawidłowa struktura danych profilu najemcy.", + "advanced-settings":"Ustawienia zaawansowane", + "entities":"Encje", + "rule-engine":"Silnik reguł", + "time-to-live":"Czas życia", + "alarms-and-notifications":"Alarmy i powiadomienia", + "ota-files-in-bytes":"Pliki", + "ws-title":"WS", + "unlimited":"(0 - nielimitowany)", + "maximum-devices":"Maksymalna liczba urządzeń", + "maximum-devices-required":"Maksymalna liczba urządzeń jest wymagana.", + "maximum-devices-range":"Maksymalna liczba urządzeń nie może być ujemna", + "maximum-assets":"Maksymalna liczba zasobów", + "maximum-assets-required":"Maksymalna liczba zasobów jest wymagana.", + "maximum-assets-range":"Maksymalna liczba zasobów nie może być ujemna", + "maximum-customers":"Maksymalna liczba klientów", + "maximum-customers-required":"Maksymalna liczba klientów jest wymagana.", + "maximum-customers-range":"Maksymalna liczba klientów nie może być ujemna", + "maximum-users":"Maksymalna liczba użytkowników", + "maximum-users-required":"Maksymalna liczba użytkowników jest wymagana.", + "maximum-users-range":"Maksymalna liczba użytkowników nie może być ujemna", + "maximum-dashboards":"Maksymalna liczba desek rozdzielczych", + "maximum-dashboards-required":"Maksymalna liczba desek rozdzielczych jest wymagana.", + "maximum-dashboards-range":"Maksymalna liczba desek rozdzielczych nie może być ujemna", + "maximum-rule-chains":"Maksymalna liczba łańcuchów reguł", + "maximum-rule-chains-required":"Maksymalna liczba łańcuchów reguł jest wymagana.", + "maximum-rule-chains-range":"Maksymalna liczba łańcuchów reguł nie może być ujemna", + "maximum-resources-sum-data-size":"Maksymalny łączny rozmiar plików zasobów (bajty)", + "maximum-resources-sum-data-size-required":"Maksymalny łączny rozmiar plików zasobów jest wymagany.", + "maximum-resources-sum-data-size-range":"Maksymalny łączny rozmiar plików zasobów nie może być ujemny", + "maximum-resource-size":"Maksymalny rozmiar pliku zasobu (bajty)", + "maximum-resource-size-required":"Maksymalny rozmiar pliku zasobu jest wymagany", + "maximum-resource-size-range":"Maksymalny rozmiar pliku zasobu nie może być ujemny", + "maximum-ota-packages-sum-data-size":"Maksymalny łączny rozmiar plików pakietów OTA (bajty)", + "maximum-ota-package-sum-data-size-required":"Maksymalny łączny rozmiar plików pakietów OTA jest wymagany.", + "maximum-ota-package-sum-data-size-range":"Maksymalny łączny rozmiar plików pakietów OTA nie może być ujemny", + "rest-requests-for-tenant":"Zapytania REST dla najemcy", + "transport-tenant-telemetry-msg-rate-limit":"Limit wiadomości telemetrii najemcy", + "transport-tenant-telemetry-data-points-rate-limit":"Limit punktów danych telemetrii najemcy", + "transport-device-msg-rate-limit":"Limit wiadomości urządzenia", + "transport-device-telemetry-msg-rate-limit":"Limit wiadomości telemetrii urządzenia", + "transport-device-telemetry-data-points-rate-limit":"Limit punktów danych telemetrii urządzenia", + "tenant-entity-export-rate-limit":"Limit eksportu wersji encji", + "tenant-entity-import-rate-limit":"Limit ładowania wersji encji", + "tenant-notification-request-rate-limit":"Limit żądań powiadomień", + "tenant-notification-requests-per-rule-rate-limit":"Limit żądań powiadomień na regułę powiadomień", + "max-transport-messages":"Maksymalna liczba wiadomości transportowych", + "max-transport-messages-required":"Maksymalna liczba wiadomości transportowych jest wymagana.", + "max-transport-messages-range":"Maksymalna liczba wiadomości transportowych nie może być ujemna", + "max-transport-data-points":"Maksymalna liczba punktów danych transportowych", + "max-transport-data-points-required":"Maksymalna liczba punktów danych transportowych jest wymagana.", + "max-transport-data-points-range":"Maksymalna liczba punktów danych transportowych nie może być ujemna", + "max-r-e-executions":"Maksymalna liczba wykonanych operacji Silnika Reguł", + "max-r-e-executions-required":"Maksymalna liczba wykonanych operacji Silnika Reguł jest wymagana.", + "max-r-e-executions-range":"Maksymalna liczba wykonanych operacji Silnika Reguł nie może być ujemna", + "max-j-s-executions":"Maksymalna liczba wykonanych operacji JavaScript", + "max-j-s-executions-required":"Maksymalna liczba wykonanych operacji JavaScript jest wymagana.", + "max-j-s-executions-range":"Maksymalna liczba wykonanych operacji JavaScript nie może być ujemna", + "max-tbel-executions":"Maksymalna liczba wykonanych operacji TBEL", + "max-tbel-executions-required":"Maksymalna liczba wykonanych operacji TBEL jest wymagana.", + "max-tbel-executions-range":"Maksymalna liczba wykonanych operacji TBEL nie może być ujemna", + "max-d-p-storage-days":"Maksymalna liczba dni przechowywania punktów danych", + "max-d-p-storage-days-required":"Maksymalna liczba dni przechowywania punktów danych jest wymagana.", + "max-d-p-storage-days-range":"Maksymalna liczba dni przechowywania punktów danych nie może być ujemna", + "default-storage-ttl-days":"Domyślny czas życia pamięci masowej w dniach", + "default-storage-ttl-days-required":"Domyślny czas życia pamięci masowej w dniach jest wymagany.", + "default-storage-ttl-days-range":"Domyślny czas życia pamięci masowej w dniach nie może być ujemny", + "alarms-ttl-days":"Czas życia alarmów w dniach", + "alarms-ttl-days-required":"Czas życia alarmów jest wymagany", + "alarms-ttl-days-days-range":"Okres przechowywania alarmów (TTL) nie może być ujemny", + "rpc-ttl-days":"RPC Okres przechowywania (TTL) dni", + "rpc-ttl-days-required":"Wymagany okres przechowywania (TTL) dni dla RPC", + "rpc-ttl-days-days-range":"Okres przechowywania (TTL) dni dla RPC nie może być ujemny", + "queue-stats-ttl-days":"Okres przechowywania (TTL) dni statystyk kolejki", + "queue-stats-ttl-days-required":"Wymagany okres przechowywania (TTL) dni dla statystyk kolejki", + "queue-stats-ttl-days-range":"Okres przechowywania (TTL) dni dla statystyk kolejki nie może być ujemny", + "rule-engine-exceptions-ttl-days":"Okres przechowywania (TTL) dni wyjątków silnika reguł", + "rule-engine-exceptions-ttl-days-required":"Wymagany okres przechowywania (TTL) dni dla wyjątków silnika reguł", + "rule-engine-exceptions-ttl-days-range":"Okres przechowywania (TTL) dni dla wyjątków silnika reguł nie może być ujemny", + "max-rule-node-executions-per-message":"Maksymalna liczba wykonanych węzłów reguł na wiadomość", + "max-rule-node-executions-per-message-required":"Wymagana maksymalna liczba wykonanych węzłów reguł na wiadomość", + "max-rule-node-executions-per-message-range":"Maksymalna liczba wykonanych węzłów reguł na wiadomość nie może być ujemna", + "max-emails":"Maksymalna liczba wysłanych wiadomości e-mail", + "max-emails-required":"Wymagana maksymalna liczba wysłanych wiadomości e-mail", + "max-emails-range":"Maksymalna liczba wysłanych wiadomości e-mail nie może być ujemna", + "sms-enabled":"SMS włączony", + "max-sms":"Maksymalna liczba wysłanych wiadomości SMS", + "max-sms-required":"Wymagana maksymalna liczba wysłanych wiadomości SMS", + "max-sms-range":"Maksymalna liczba wysłanych wiadomości SMS nie może być ujemna", + "max-created-alarms":"Maksymalna liczba utworzonych alarmów", + "max-created-alarms-required":"Wymagana maksymalna liczba utworzonych alarmów", + "max-created-alarms-range":"Maksymalna liczba utworzonych alarmów nie może być ujemna", + "no-queue":"Brak skonfigurowanej kolejki", + "add-queue":"Dodaj kolejkę", + "queues-with-count":"Kolejki ({{count}})", + "tenant-rest-limits":"Żądania REST dla najemcy", + "customer-rest-limits":"Żądania REST dla klienta", + "incorrect-pattern-for-rate-limits":"Nieprawidłowy format dla limitów szybkości. Pary pojemność:okres (w sekundach) oddzielone przecinkiem, np. 100:1,2000:60", + "too-small-value-zero":"Wartość musi być większa niż 0", + "too-small-value-one":"Wartość musi być większa niż 1", + "queue-size-is-limited-by-system-configuration":"Rozmiar kolejki jest również ograniczony konfiguracją systemu.", + "cassandra-tenant-limits-configuration":"Zapytanie do Cassandry dla najemcy", + "ws-limit-max-sessions-per-tenant":"Maksymalna liczba sesji na najemcę", + "ws-limit-max-sessions-per-customer":"Maksymalna liczba sesji na klienta", + "ws-limit-max-sessions-per-regular-user":"Maksymalna liczba sesji na zwykłego użytkownika", + "ws-limit-max-sessions-per-public-user":"Maksymalna liczba sesji na publicznego użytkownika", + "ws-limit-queue-per-session":"Maksymalny rozmiar kolejki wiadomości na sesję", + "ws-limit-max-subscriptions-per-tenant":"Maksymalna liczba subskrypcji na najemcę", + "ws-limit-max-subscriptions-per-customer":"Maksymalna liczba subskrypcji na klienta", + "ws-limit-max-subscriptions-per-regular-user":"Maksymalna liczba subskrypcji na zwykłego użytkownika", + "ws-limit-max-subscriptions-per-public-user":"Maksymalna liczba subskrypcji na publicznego użytkownika", + "ws-limit-updates-per-session":"Aktualizacje WS na sesję", + "rate-limits":{ + "add-limit":"Dodaj limit", + "advanced-settings":"Zaawansowane ustawienia", + "edit-limit":"Edytuj limit", + "but-less-than":"ale mniejsze niż", + "edit-transport-tenant-msg-title":"Edytuj limity szybkości przesyłania komunikatów najemcy", + "edit-transport-tenant-telemetry-msg-title":"Edytuj limity szybkości przesyłania telemetrii komunikatów najemcy", + "edit-transport-tenant-telemetry-data-points-title":"Edytuj limity szybkości przesyłania punktów danych telemetrii najemcy", + "edit-transport-device-msg-title":"Edytuj limity szybkości przesyłania komunikatów urządzenia", + "edit-transport-device-telemetry-msg-title":"Edytuj limity szybkości przesyłania telemetrii komunikatów urządzenia", + "edit-transport-device-telemetry-data-points-title":"Edytuj limity szybkości przesyłania punktów danych telemetrii urządzenia", + "edit-tenant-rest-limits-title":"Edytuj limity szybkości żądań REST dla najemcy", + "edit-customer-rest-limits-title":"Edytuj limity szybkości żądań REST dla klienta", + "edit-ws-limit-updates-per-session-title":"Edytuj limity szybkości aktualizacji WS na sesję", + "edit-cassandra-tenant-limits-configuration-title":"Edytuj limity szybkości zapytań do Cassandry dla najemcy", + "edit-tenant-entity-export-rate-limit-title":"Edytuj limity szybkości tworzenia wersji jednostki dla najemcy", + "edit-tenant-entity-import-rate-limit-title":"Edytuj limity szybkości wczytywania wersji jednostki dla najemcy", + "edit-tenant-notification-request-rate-limit-title":"Edytuj limity szybkości żądań powiadomień dla najemcy", + "edit-tenant-notification-requests-per-rule-rate-limit-title":"Edytuj limity szybkości żądań powiadomień na regułę powiadomień dla najemcy", + "messages-per":"komunikatów na", + "not-set":"Nie ustawiono", + "number-of-messages":"Liczba komunikatów", + "number-of-messages-required":"Wymagana liczba komunikatów.", + "number-of-messages-min":"Minimalna wartość to 1.", + "preview":"Podgląd", + "per-seconds":"Na sekundę", + "per-seconds-required":"Wymagana jest szybkość czasowa.", + "per-seconds-min":"Minimalna wartość to 1.", + "rate-limits":"Limity szybkości", + "remove-limit":"Usuń limit", + "transport-tenant-msg":"Przesyłanie komunikatów najemcy", + "transport-tenant-telemetry-msg":"Przesyłanie telemetrii komunikatów najemcy", + "transport-tenant-telemetry-data-points":"Przesyłanie punktów danych telemetrii najemcy", + "transport-device-msg":"Przesyłanie komunikatów urządzenia", + "transport-device-telemetry-msg":"Przesyłanie telemetrii komunikatów urządzenia", + "transport-device-telemetry-data-points":"Przesyłanie punktów danych telemetrii urządzenia", + "sec":"sek" + } + }, + "timeinterval":{ + "seconds-interval":"{ seconds, plural, =1 {1 sekunda} other {# sekundy} }", + "minutes-interval":"{ minutes, plural, =1 {1 minuta} other {# minuty} }", + "hours-interval":"{ hours, plural, =1 {1 godzina} other {# godziny} }", + "days-interval":"{ days, plural, =1 {1 dzień} other {# dni} }", + "days":"Dni", + "hours":"Godziny", + "minutes":"Minuty", + "seconds":"Sekundy", + "advanced":"Zaawansowane", + "predefined":{ + "yesterday":"Wczoraj", + "day-before-yesterday":"Przedwczoraj", + "this-day-last-week":"Ten dzień w zeszłym tygodniu", + "previous-week":"Poprzedni tydzień (Ndz - Sob)", + "previous-week-iso":"Poprzedni tydzień (Pon - Ndz)", + "previous-month":"Poprzedni miesiąc", + "previous-quarter":"Poprzedni kwartał", + "previous-half-year":"Poprzednie półrocze", + "previous-year":"Poprzedni rok", + "current-hour":"Bieżąca godzina", + "current-day":"Bieżący dzień", + "current-day-so-far":"Bieżący dzień do tej pory", + "current-week":"Bieżący tydzień (Ndz - Sob)", + "current-week-iso":"Bieżący tydzień (Pon - Ndz)", + "current-week-so-far":"Bieżący tydzień do tej pory (Ndz - Sob)", + "current-week-iso-so-far":"Bieżący tydzień do tej pory (Pon - Ndz)", + "current-month":"Bieżący miesiąc", + "current-month-so-far":"Bieżący miesiąc do tej pory", + "current-quarter":"Bieżący kwartał", + "current-quarter-so-far":"Bieżący kwartał do tej pory", + "current-half-year":"Bieżące półrocze", + "current-half-year-so-far":"Bieżące półrocze do tej pory", + "current-year":"Bieżący rok", + "current-year-so-far":"Bieżący rok do tej pory" + }, + "type":{ + "week":"Tydzień (Ndz - Sob)", + "week-iso":"Tydzień (Pon - Ndz)", + "month":"Miesiąc", + "quarter":"Kwartał" + } + }, + "timeunit":{ + "milliseconds":"Milisekundy", + "seconds":"Sekundy", + "minutes":"Minuty", + "hours":"Godziny", + "days":"Dni" + }, + "timewindow":{ + "timewindow":"Okno czasowe", + "years":"{ years, plural, =1 { rok } other {# lata } }", + "years-short":"{{ years }}r", + "months":"{ months, plural, =1 { miesiąc } other {# miesiące } }", + "months-short":"{{ months }}m", + "weeks":"{ weeks, plural, =1 { tydzień } other {# tygodnie } }", + "weeks-short":"{{ weeks }}t", + "days":"{ days, plural, =1 { dzień } other {# dni } }", + "days-short":"{{ days }}d", + "hours":"{ hours, plural, =0 { godzina } =1 {1 godzina } other {# godziny } }", + "hr":"{{ hr }} godz", + "hr-short":"{{ hr }}h", + "minutes":"{ minutes, plural, =0 { minuta } =1 {1 minuta } other {# minuty } }", + "min":"{{ min }} min", + "min-short":"{{ min }}m", + "seconds":"{ seconds, plural, =0 { sekunda } =1 {1 sekunda } other {# sekundy } }", + "sec":"{{ sec }} sek", + "sec-short":"{{ sec }}s", + "short":{ + "days":"{ days, plural, =1 {1 dzień } other {# dni } }", + "hours":"{ hours, plural, =1 {1 godzina } other {# godziny } }", + "minutes":"{{minutes}} min ", + "seconds":"{{seconds}} sek " + }, + "realtime":"Na żywo", + "history":"Historia", + "last-prefix":"ostatni", + "period":"od {{ startTime }} do {{ endTime }}", + "edit":"Edytuj okno czasowe", + "date-range":"Zakres dat", + "for-all-time":"Dla wszystkich dostępnych danych", + "last":"Ostatnie", + "time-period":"Okres czasu", + "hide":"Ukryj", + "interval":"Interwał", + "just-now":"Teraz", + "just-now-lower":"teraz", + "ago":"temu", + "style":"Styl okna czasowego", + "icon":"Ikona", + "icon-position":"Pozycja ikony", + "icon-position-left":"Lewo", + "icon-position-right":"Prawo", + "font":"Czcionka", + "color":"Kolor", + "displayTypePrefix":"Wyświetlaj przedrostek Na żywo/Historia", + "preview":"Podgląd" + }, + "tooltip":{ + "value":"Wartość", + "date":"Data", + "background-color":"Kolor tła", + "background-blur":"Rozmycie tła" + }, + "unit":{ + "millimeter":"Milimetr", + "centimeter":"Centymetr", + "angstrom":"Angstrom", + "nanometer":"Nanometr", + "micrometer":"Mikrometr", + "meter":"Metr", + "kilometer":"Kilometr", + "inch":"Cal", + "foot":"Stopa", + "yard":"Jard", + "mile":"Mila", + "nautical-mile":"Mila morska", + "astronomical-unit":"Jednostka astronomiczna", + "reciprocal-metre":"Odwrócony metr", + "meter-per-meter":"Metr na metr", + "steradian":"Steradian", + "thou":"Thou", + "barleycorn":"Jęczmień", + "hand":"Dłoń", + "chain":"Ciąg", + "furlong":"Furlong", + "league":"Liga", + "fathom":"Fathom", + "cable":"Kabel", + "link":"Link", + "rod":"Ród", + "nanogram":"Nanogram", + "microgram":"Mikrogram", + "milligram":"Miligram", + "gram":"Gram", + "kilogram":"Kilogram", + "tonne":"Tonna", + "ounce":"Uncja", + "pound":"Funt", + "stone":"Stoun", + "hundredweight-count":"Cental", + "short-tons":"Krótka tona", + "dalton":"Dalton", + "grain":"Gran", + "drachm":"Drachma", + "quarter":"Quarter", + "slug":"Slug", + "carat":"Karad", + "cubic-millimeter":"Milimetr sześcienny", + "cubic-centimeter":"Centymetr sześcienny", + "cubic-meter":"Metr sześcienny", + "cubic-kilometer":"Kilometr sześcienny", + "microliter":"Mikrolitr", + "milliliter":"Mililitr", + "liter":"Litr", + "hectoliter":"Hektolitr", + "cubic-inch":"Cal sześcienny", + "cubic-foot":"Stopa sześcienna", + "cubic-yard":"Jard sześcienny", + "fluid-ounce":"Uncja płynu", + "pint":"Pinta", + "quart":"Kwarta", + "gallon":"Galona", + "oil-barrels":"Baryłki naftowe", + "cubic-meter-per-kilogram":"Metr sześcienny na kilogram", + "gill":"Gill", + "hogshead":"Hogshead", + "teaspoon":"Łyżeczka", + "tablespoon":"Łyżka stołowa", + "cup":"Kubek", + "celsius":"Stopnie Celsiusza", + "kelvin":"Kelwin", + "rankine":"Rankine", + "fahrenheit":"Stopnie Fahrenheita", + "percent":"Procent", + "meter-per-second":"Metr na sekundę", + "kilometer-per-hour":"Kilometr na godzinę", + "foot-per-second":"Stopa na sekundę", + "mile-per-hour":"Mila na godzinę", + "knot":"Węzeł", + "millimeters-per-minute":"Milimetrów na minutę", + "kilometer-per-hour-squared":"Kilometr na godzinę do kwadratu", + "foot-per-second-squared":"Stopa na sekundę do kwadratu", + "pascal":"Pascal", + "kilopascal":"Kilopascal", + "megapascal":"Megapascal", + "gigapascal":"Gigapascal", + "millibar":"Milibar", + "bar":"Bar", + "kilobar":"Kilobar", + "newton":"Newton", + "newton-meter":"Newton-metr", + "foot-pounds":"Stopy funtów", + "inch-pounds":"Calowe funty", + "newton-per-meter":"Newton na metr", + "atmospheres":"Atmosfery", + "pounds-per-square-inch":"Funtów na cal kwadratowy", + "torr":"Torr", + "inches-of-mercury":"Cale rtęci", + "pascal-per-square-meter":"Pascal na metr kwadratowy", + "pound-per-square-inch":"Funt na cal kwadratowy", + "newton-per-square-meter":"Newton na metr kwadratowy", + "kilogram-force-per-square-meter":"Kilogram-siła na metr kwadratowy", + "pascal-per-square-centimeter":"Pascal na centymetr kwadratowy", + "ton-force-per-square-inch":"Ton-siła na cal kwadratowy", + "kilonewton-per-square-meter":"Kilonewton na metr kwadratowy", + "newton-per-square-millimeter":"Newton na milimetr kwadratowy", + "microjoule":"Mikrodżul", + "millijoule":"Milidżul", + "joule":"Dżul", + "kilojoule":"Kilodżul", + "megajoule":"Megadżul", + "gigajoule":"Gigadżul", + "watt-hour":"Watogodzina", + "kilowatt-hour":"Kilowatogodzina", + "electron-volts":"Elektronowolt", + "joules-per-coulomb":"Dżule na kulomb", + "british-thermal-unit":"Brytyjska jednostka ciepła", + "foot-pound":"Stopa-funt", + "calorie":"Kaloria", + "small-calorie":"Mała kaloria", + "kilocalorie":"Kilokaloria", + "joule-per-kelvin":"Dżul na kelwin", + "joule-per-kilogram-kelvin":"Dżul na kilogram-kelwin", + "joule-per-kilogram":"Dżul na kilogram", + "watt-per-meter-kelvin":"Wat na metr-kelwin", + "joule-per-cubic-meter":"Dżul na metr sześcienny", + "therm":"Term", + "electric-dipole-moment":"Moment dipolowy elektryczny", + "magnetic-dipole-moment":"Moment dipolowy magnetyczny", + "debye":"Debye", + "coulomb-per-square-meter-per-volt":"Kulomb na metr kwadratowy na wolt", + "milliwatt":"Miliwat", + "microwatt":"Mikrowat", + "watt":"Wat", + "kilowatt":"Kilowat", + "megawatt":"Megawat", + "gigawatt":"Gigawat", + "metric-horsepower":"Koń mechaniczny metryczny", + "milliwatt-per-square-centimeter":"Miliwaty na centymetr kwadratowy", + "watt-per-square-centimeter":"Waty na centymetr kwadratowy", + "kilowatt-per-square-centimeter":"Kilowat na centymetr kwadratowy", + "milliwatt-per-square-meter":"Miliwaty na metr kwadratowy", + "watt-per-square-meter":"Waty na metr kwadratowy", + "kilowatt-per-square-meter":"Kilowaty na metr kwadratowy", + "watt-per-square-inch":"Waty na cal kwadratowy", + "kilowatt-per-square-inch":"Kilowaty na cal kwadratowy", + "horsepower":"Koń mechaniczny", + "btu-per-hour":"Brytyjskie jednostki ciepła na godzinę", + "coulomb":"Kulomb", + "millicoulomb":"Milikulomb", + "microcoulomb":"Mikrokulomb", + "picocoulomb":"Pikokulomb", + "coulomb-per-meter":"Kulomb na metr", + "coulomb-per-cubic-meter":"Kulomb na metr sześcienny", + "coulomb-per-square-meter":"Kulomb na metr kwadratowy", + "square-millimeter":"Metr kwadratowy", + "square-centimeter":"Centymetr kwadratowy", + "square-meter":"Metr kwadratowy", + "hectare":"Hektar", + "square-kilometer":"Kilometr kwadratowy", + "square-inch":"Cal kwadratowy", + "square-foot":"Stopa kwadratowa", + "square-yard":"Jard kwadratowy", + "acre":"Akr", + "square-mile":"Mila kwadratowa", + "are":"Ar", + "barn":"Barn", + "circular-inch":"Cal okrągły", + "milliampere-hour":"Miliamperogodzina", + "milliampere-hour-tags":"prąd elektryczny, przepływ prądu, ładunek elektryczny, pojemność prądu, przepływ elektryczności, przepływ elektryczny, godzina miliamperowa, miliamperogodziny, mAh", + "ampere-hours":"Amperogodziny", + "ampere-hours-tags":"prąd elektryczny, przepływ prądu, ładunek elektryczny, pojemność prądu, przepływ elektryczności, przepływ elektryczny, amper, amperogodziny, Ah", + "kiloampere-hours":"Kiloamperogodziny", + "kiloampere-hours-tags":"prąd elektryczny, przepływ prądu, ładunek elektryczny, pojemność prądu, przepływ elektryczności, przepływ elektryczny, kiloamperogodziny, kiloamperogodzina, kAh", + "nanoampere":"Nanoamper", + "nanoampere-tags":"prąd, ampery, nanoamper, nA", + "picoampere":"Pikoamper", + "picoampere-tags":"prąd, ampery, pikoamper, pA", + "microampere":"Mikroamper", + "microampere-tags":"prąd elektryczny, mikroamper, mikroampery, μA", + "milliampere":"Miliamper", + "milliampere-tags":"prąd elektryczny, miliamper, miliampery, mA", + "ampere":"Amper", + "ampere-tags":"prąd elektryczny, przepływ prądu, przepływ elektryczności, przepływ elektryczny, amper, ampery, amperaż, A", + "kiloamperes":"Kiloampery", + "kiloamperes-tags":"prąd elektryczny, przepływ prądu, kiloampery, kA", + "microampere-per-square-centimeter":"Mikroamper na centymetr kwadratowy", + "microampere-per-square-centimeter-tags":"Gęstość prądu, mikroamper na centymetr kwadratowy, µA/cm²", + "ampere-per-square-meter":"Amper na metr kwadratowy", + "ampere-per-square-meter-tags":"gęstość prądu, prąd na jednostkę powierzchni, amper na metr kwadratowy, A/m²", + "ampere-per-meter":"Amper na metr", + "ampere-per-meter-tags":"siła pola magnetycznego, intensywność pola magnetycznego, amper na metr, A/m", + "oersted":"Oersted", + "oersted-tags":"pole magnetyczne, oersted, Oe", + "bohr-magneton":"Magnetony Bohra", + "bohr-magneton-tags":"fizyka atomowa, moment magnetyczny, magneton Bohra, μB", + "ampere-meter-squared":"Amper-Metr Kwadratowy", + "ampere-meter-squared-tags":"moment magnetyczny, moment dipolowy, amper-metr kwadratowy, A·m²", + "ampere-meter":"Amper-Metr", + "ampere-meter-tags":"pole magnetyczne, pętla prądowa, amper-metr, A·m", + "nanovolt":"Nanowolt", + "picovolt":"Pikowolt", + "millivolts":"Milivolty", + "microvolts":"Mikrowolty", + "volt":"Wolt", + "kilovolts":"Kilowolty", + "dbmV":"dBmV", + "dbm":"dBm", + "volt-meter":"Woltomierz", + "kilovolt-meter":"Kilowoltomierz", + "megavolt-meter":"Megawoltomierz", + "microvolt-meter":"Mikrowoltomierz", + "millivolt-meter":"Milivoltomierz", + "nanovolt-meter":"Nanowoltomierz", + "ohm":"Om", + "microohm":"Mikroom", + "milliohm":"Miloom", + "kilohm":"Kiloom", + "megohm":"Megaom", + "gigohm":"Gigaom", + "hertz":"Herz", + "kilohertz":"Kilohertz", + "megahertz":"Megahertz", + "gigahertz":"Gigahertz", + "rpm":"Obroty na minutę", + "candela-per-square-meter":"Kandela na metr kwadratowy", + "candela":"Kandela", + "lumen":"Lumen", + "lux":"Luks", + "foot-candle":"Stopa-świeca", + "lumen-per-square-meter":"Lumen na metr kwadratowy", + "lux-second":"Luks-sekunda", + "lumen-second":"Lumen-sekunda", + "lumens-per-watt":"Lumeny na wat", + "absorbance":"Absorpcja", + "mole":"Mol", + "nanomole":"Nanomol", + "micromole":"Mikromol", + "millimole":"Milimol", + "kilomole":"Kilomol", + "mole-per-cubic-meter":"Mol na metr sześcienny", + "rssi":"RSSI", + "ppm":"Części na milion", + "ppb":"Części na miliard", + "micrograms-per-cubic-meter":"Mikrogramy na metr sześcienny", + "aqi":"AQI", + "gram-per-cubic-meter":"Gram na metr sześcienny", + "gram-per-kilogram":"Wilgotność właściwa", + "millimeters-per-second":"Milimetry na sekundę", + "neper":"Neper", + "bel":"Bel", + "decibel":"Decybel", + "meters-per-second-squared":"Metry na sekundę kwadratową", + "becquerel":"Bekerel", + "curie":"Kiri", + "gray":"Graj", + "sievert":"Sivert", + "roentgen":"Rentgen", + "cps":"Zliczenia na sekundę", + "rad":"Rad", + "rem":"Rem", + "dps":"Rozpady na sekundę", + "rutherford":"Rutherford", + "coulombs-per-kilogram":"Kulomby na kilogram", + "becquerels-per-cubic-meter":"Bekerel na metr sześcienny", + "curies-per-liter":"Kiri na litr", + "becquerels-per-second":"Bekerel na sekundę", + "curies-per-second":"Kiri na sekundę", + "gy-per-second":"Graj na sekundę", + "watt-per-steradian":"Wat na steradian", + "watt-per-square-metre-steradian":"Wat na metr kwadratowy-steradian", + "ph-level":"Poziom pH", + "turbidity":"Mętność", + "mg-per-liter":"Miligramy na litr", + "microsiemens-per-centimeter":"Mikrosiemeny na centymetr", + "millisiemens-per-meter":"Milisiemeny na metr", + "siemens-per-meter":"Siemeny na metr", + "kilogram-per-cubic-meter":"Kilogram na metr sześcienny", + "gram-per-cubic-centimeter":"Gram na centymetr sześcienny", + "kilogram-per-square-meter":"Kilogram na metr kwadratowy", + "milligram-per-milliliter":"Miligram na mililitr", + "milligram-per-cubic-meter":"Miligram na metr sześcienny", + "pound-per-cubic-foot":"Funt na stopę sześcienną", + "ounces-per-cubic-inch":"Uncje na cal sześcienny", + "tons-per-cubic-yard":"Tony na jard sześcienny", + "particle-density":"Gęstość cząstek", + "kilometers-per-liter":"Kilometry na litr", + "miles-per-gallon":"Mile na galon", + "liters-per-100-km":"Litrów na 100 kilometrów", + "gallons-per-mile":"Galony na milę", + "liters-per-hour":"Litrów na godzinę", + "gallons-per-hour":"Galony na godzinę", + "beats-per-minute":"Uderzenia na minutę", + "millimeters-of-mercury":"Milimetry słupa rtęci", + "milligrams-per-deciliter":"Miligramy na decylitr", + "g-force":"Siła G", + "kilonewton":"Kiloniuton", + "kilogram-force":"Kilogram-siła", + "pound-force":"Funt-siła", + "kilopound-force":"Kilofunt-siła", + "dyne":"Dyn", + "poundal":"Poundal", + "kip":"Kip", + "gal":"Gal", + "gravity":"Przyspieszenie grawitacyjne", + "hectopascal":"Hektopaskal", + "atmosphere":"Atmosfera", + "millibars":"Milibary", + "inch-of-mercury":"Cal słupa rtęci", + "richter-scale":"Skala Richtera", + "second":"Sekunda", + "minute":"Minuta", + "hour":"Godzina", + "day":"Dzień", + "week":"Tydzień", + "month":"Miesiąc", + "year":"Rok", + "cubic-foot-per-minute":"Stopy sześcienne na minutę", + "cubic-meters-per-hour":"Metry sześcienne na godzinę", + "cubic-meters-per-second":"Metry sześcienne na sekundę", + "liter-per-second":"Litr na sekundę", + "liter-per-minute":"Litr na minutę", + "gallons-per-minute":"Galony na minutę", + "cubic-foot-per-second":"Stopa sześcienna na sekundę", + "milliliters-per-minute":"Mililitrów na minutę", + "bit":"Bit", + "byte":"Bajt", + "kilobyte":"Kilobajt", + "megabyte":"Megabajt", + "gigabyte":"Gigabajt", + "terabyte":"Terabajt", + "petabyte":"Petabajt", + "exabyte":"Eksabajt", + "zettabyte":"Zettabajt", + "yottabyte":"Jottabajt", + "bit-per-second":"Bit na sekundę", + "kilobit-per-second":"Kilobit na sekundę", + "megabit-per-second":"Megabit na sekundę", + "gigabit-per-second":"Gigabit na sekundę", + "terabit-per-second":"Terabit na sekundę", + "byte-per-second":"Bajt na sekundę", + "kilobyte-per-second":"Kilobajt na sekundę", + "megabyte-per-second":"Megabajt na sekundę", + "gigabyte-per-second":"Gigabajt na sekundę", + "degree":"Stopień", + "radian":"Radian", + "gradian":"Grad", + "mil":"Mil", + "revolution":"Obrotów", + "siemens":"Siemens", + "millisiemens":"Milisiemens", + "microsiemens":"Mikrosiemens", + "kilosiemens":"Kilosiemens", + "megasiemens":"Megasiemens", + "gigasiemens":"Gigasiemens", + "farad":"Farad", + "millifarad":"Milifarad", + "microfarad":"Mikrofarad", + "nanofarad":"Nanofarad", + "picofarad":"Pikofarad", + "kilofarad":"Kilofarad", + "megafarad":"Megafarad", + "gigafarad":"Gigafarad", + "terfarad":"Terfarad", + "farad-per-meter":"Farad na metr", + "tesla":"Tesla", + "gauss":"Gaus", + "kilogauss":"Kilogaus", + "millitesla":"Millitesla", + "microtesla":"Mikrotesla", + "nanotesla":"Nanotesla", + "kilotesla":"Kilotesla", + "megatesla":"Megatesla", + "millitesla-square-meters":"Millitesla na metry kwadratowe", + "gamma":"Gamma", + "lambda":"Lambda", + "square-meter-per-second":"Metr kwadratowy na sekundę", + "square-centimeter-per-second":"Centymetr kwadratowy na sekundę", + "stoke":"Stoke", + "centistokes":"Centistoke", + "square-foot-per-second":"Stopa kwadratowa na sekundę", + "square-inch-per-second":"Cal kwadratowy na sekundę", + "pascal-second":"Paskal-sekunda", + "centipoise":"Centipoise", + "poise":"Poise", + "reynolds":"Reynolds", + "pound-per-foot-hour":"Funt na stopę kwadratową na godzinę", + "newton-second-per-square-meter":"Newton-sekunda na metr kwadratowy", + "dyne-second-per-square-centimeter":"Dyn-sekunda na centymetr kwadratowy", + "kilogram-per-meter-second":"Kilogram na metr-sekundę", + "tesla-square-meters":"Tesla na metry kwadratowe", + "maxwell":"Maxwell", + "tesla-per-meter":"Tesla na metr", + "gauss-per-centimeter":"Gaus na centymetr", + "weber":"Weber", + "microweber":"Mikroweber", + "milliweber":"Milliweber", + "gauss-square-centimeter":"Gaus na centymetr kwadratowy", + "kilogauss-square-centimeter":"Kilogaus na centymetr kwadratowy", + "henry":"Henry", + "millihenry":"Millihenry", + "microhenry":"Mikrohenry", + "nanohenry":"Nanohenry", + "henry-per-meter":"Henry na metr", + "tesla-meter-per-ampere":"Tesla na metr na amper", + "gauss-per-oersted":"Gaus na Oersted", + "kilogram-per-mole":"Kilogram na mol", + "gram-per-mole":"Gram na mol", + "milligram-per-mole":"Miligram na mol", + "joule-per-mole":"Dżul na mol", + "joule-per-mole-kelvin":"Dżul na mol-kelwin", + "millivolts-per-meter":"Milivolty na metr", + "volts-per-meter":"Volty na metr", + "kilovolts-per-meter":"Kilovolty na metr", + "radian-per-second":"Radian na sekundę", + "radian-per-second-squared":"Radian na sekundę kwadratową", + "revolutions-per-minute-per-second":"Przyspieszenie kątowe", + "revolutions-per-minute-per-second-squared":"Przyspieszenie kątowe", + "deg-per-second":"Stopnie na sekundę", + "degrees-brix":"Stopnie Brix", + "katal":"Katal", + "katal-per-cubic-metre":"Katal na metr sześcienny" + }, + "user":{ + "user":"Użytkownik", + "users":"Użytkownicy", + "customer-users":"Użytkownicy klienta", + "tenant-admins":"Administratorzy najemcy", + "sys-admin":"Administrator systemu", + "tenant-admin":"Administrator najemcy", + "customer":"Klient", + "anonymous":"Anonimowy", + "add":"Dodaj użytkownika", + "delete":"Usuń użytkownika", + "add-user-text":"Dodaj nowego użytkownika", + "no-users-text":"Nie znaleziono użytkowników", + "user-details":"Szczegóły użytkownika", + "delete-user-title":"Czy na pewno chcesz usunąć użytkownika '{{userEmail}}'?", + "delete-user-text":"Uważaj, po potwierdzeniu użytkownik i wszystkie powiązane dane staną się nieodwracalne.", + "delete-users-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 użytkownika} other {# użytkowników} }?", + "delete-users-action-title":"Usuń { count, plural, =1 {1 użytkownika} other {# użytkowników} }", + "delete-users-text":"Uważaj, po potwierdzeniu wszyscy wybrani użytkownicy zostaną usunięci, a wszystkie powiązane dane staną się nieodwracalne.", + "activation-email-sent-message":"E-mail aktywacyjny został wysłany pomyślnie!", + "resend-activation":"Wyślij ponownie aktywację", + "email":"Email", + "email-required":"Email jest wymagany.", + "invalid-email-format":"Nieprawidłowy format email.", + "first-name":"Imię", + "last-name":"Nazwisko", + "description":"Opis", + "default-dashboard":"Domyślny pulpit", + "always-fullscreen":"Zawsze na pełnym ekranie", + "select-user":"Wybierz użytkownika", + "no-users-matching":"Nie znaleziono użytkowników pasujących do '{{entity}}'.", + "user-required":"Użytkownik jest wymagany", + "activation-method":"Metoda aktywacji", + "display-activation-link":"Wyświetl link aktywacyjny", + "send-activation-mail":"Wyślij mail aktywacyjny", + "activation-link":"Link aktywacyjny użytkownika", + "activation-link-text":"Aby aktywować użytkownika, użyj następującego linku aktywacyjnego:", + "copy-activation-link":"Kopiuj link aktywacyjny", + "activation-link-copied-message":"Link aktywacyjny użytkownika został skopiowany do schowka", + "details":"Szczegóły", + "login-as-tenant-admin":"Zaloguj jako Administrator Najemcy", + "login-as-customer-user":"Zaloguj jako Użytkownik Klienta", + "search":"Szukaj użytkowników", + "selected-users":"{ count, plural, =1 {1 użytkownik} other {# użytkowników} } wybrano", + "disable-account":"Wyłącz konto użytkownika", + "enable-account":"Włącz konto użytkownika", + "enable-account-message":"Konto użytkownika zostało pomyślnie włączone!", + "disable-account-message":"Konto użytkownika zostało pomyślnie wyłączone!", + "copyId":"Kopiuj Id użytkownika", + "idCopiedMessage":"Id użytkownika zostało skopiowane do schowka", + "user-list":"Lista użytkowników", + "user-list-required":"Lista użytkowników jest wymagana" + }, + "value":{ + "type":"Typ wartości", + "string":"Ciąg znaków", + "string-value":"Wartość ciągu znaków", + "string-value-required":"Wartość ciągu znaków jest wymagana", + "integer":"Liczba całkowita", + "integer-value":"Wartość liczby całkowitej", + "integer-value-required":"Wartość liczby całkowitej jest wymagana", + "invalid-integer-value":"Nieprawidłowa wartość liczby całkowitej", + "double":"Podwójna", + "double-value":"Wartość podwójna", + "double-value-required":"Wartość podwójna jest wymagana", + "boolean":"Boolean", + "boolean-value":"Wartość Boolean", + "false":"Fałsz", + "true":"Prawda", + "long":"Długa", + "json":"JSON", + "json-value":"Wartość JSON", + "json-value-invalid":"Wartość JSON ma nieprawidłowy format", + "json-value-required":"Wartość JSON jest wymagana." + }, + "version-control":{ + "version-control":"Kontrola wersji", + "management":"Zarządzanie kontrolą wersji", + "search":"Szukaj wersji", + "branch":"Gałąź", + "default":"Domyślna", + "select-branch":"Wybierz gałąź", + "branch-required":"Gałąź jest wymagana", + "create-entity-version":"Utwórz wersję encji", + "version-name":"Nazwa wersji", + "version-name-required":"Nazwa wersji jest wymagana", + "author":"Autor", + "export-relations":"Eksportuj relacje", + "export-attributes":"Eksportuj atrybuty", + "export-credentials":"Eksportuj poświadczenia", + "entity-versions":"Wersje encji", + "versions":"Wersje", + "created-time":"Czas utworzenia", + "version-id":"ID wersji", + "no-entity-versions-text":"Nie znaleziono wersji encji", + "no-versions-text":"Nie znaleziono wersji", + "copy-full-version-id":"Kopiuj pełne ID wersji", + "create-version":"Utwórz wersję", + "creating-version":"Tworzenie wersji... Proszę czekać", + "nothing-to-commit":"Brak zmian do zatwierdzenia", + "restore-version":"Przywróć wersję", + "restore-entity-from-version":"Przywróć encję z wersji '{{versionName}}'", + "restoring-entity-version":"Przywracanie wersji encji... Proszę czekać", + "load-relations":"Załaduj relacje", + "load-attributes":"Załaduj atrybuty", + "load-credentials":"Załaduj poświadczenia", + "compare-with-current":"Porównaj z obecną", + "diff-entity-with-version":"Różnice z wersją encji '{{versionName}}'", + "previous-difference":"Poprzednia różnica", + "next-difference":"Następna różnica", + "current":"Obecna", + "differences":"{ count, plural, =1 {1 różnica} other {# różnice} }", + "create-entities-version":"Utwórz wersję encji", + "default-sync-strategy":"Domyślna strategia synchronizacji", + "sync-strategy-merge":"Scal", + "sync-strategy-overwrite":"Nadpisz", + "entities-to-export":"Encje do eksportu", + "entities-to-restore":"Encje do przywrócenia", + "sync-strategy":"Strategia synchronizacji", + "all-entities":"Wszystkie encje", + "no-entities-to-export-prompt":"Proszę określić encje do eksportu", + "no-entities-to-restore-prompt":"Proszę określić encje do przywrócenia", + "add-entity-type":"Dodaj typ encji", + "remove-all":"Usuń wszystko", + "version-create-result":"{ added, plural, =0 {Nie dodano encji} =1 {Dodano 1 encję} other {Dodano # encji} }.
{ modified, plural, =0 {Nie zmodyfikowano encji} =1 {Zmodyfikowano 1 encję} other {Zmodyfikowano # encji} }.
{ removed, plural, =0 {Nie usunięto encji} =1 {Usunięto 1 encję} other {Usunięto # encji} }.", + "remove-other-entities":"Usuń inne encje", + "find-existing-entity-by-name":"Znajdź istniejącą encję po nazwie", + "restore-entities-from-version":"Przywróć encje z wersji '{{versionName}}'", + "restoring-entities-from-version":"Przywracanie encji... Proszę czekać", + "no-entities-restored":"Nie przywrócono żadnych encji", + "created":"{{created}} utworzonych", + "updated":"{{updated}} zaktualizowanych", + "deleted":"{{deleted}} usuniętych", + "remove-other-entities-confirm-text":"Uważaj! To trwale usunie wszystkie bieżące encje
nieobecne w wersji, którą chcesz przywrócić.

Proszę wpisać \"usuń inne encje\", aby potwierdzić.", + "auto-commit-to-branch":"automatyczne zatwierdzenie do gałęzi {{ branch }}", + "default-create-entity-version-name":"Aktualizacja {{entityName}}", + "sync-strategy-merge-hint":"Tworzy lub aktualizuje wybrane encje w repozytorium. Wszystkie inne encje w repozytorium są niezmodyfikowane.", + "sync-strategy-overwrite-hint":"Tworzy lub aktualizuje wybrane encje w repozytorium. Wszystkie inne encje w repozytorium są usunięte.", + "device-credentials-conflict":"Nie udało się załadować urządzenia z zewnętrznym id {{entityId}}
ponieważ te same poświadczenia są już obecne w bazie danych dla innego urządzenia.
Rozważ wyłączenie opcji załaduj poświadczenia w formularzu przywracania.", + "missing-referenced-entity":"Nie udało się załadować {{sourceEntityTypeName}} z zewnętrznym id {{sourceEntityId}}
ponieważ odnosi się do brakującej {{targetEntityTypeName}} z id {{targetEntityId}}.", + "runtime-failed":"Failed: {{message}}", + "auto-commit-settings-read-only-hint":"Funkcja automatycznego zatwierdzania nie działa z włączoną opcją tylko do odczytu w ustawieniach repozytorium." + }, + "widget":{ + "widget-library":"Biblioteka widgetów", + "widget-bundle":"Pakiet widgetów", + "all-bundles":"Wszystkie pakiety", + "select-widgets-bundle":"Wybierz pakiet widgetów", + "widgets":"Widgety", + "all-widgets":"Wszystkie widgety", + "widget":"Widget", + "select-widget":"Wybierz widget", + "no-widgets-matching":"Nie znaleziono widgetów pasujących do '{{entity}}'.", + "no-widgets":"Brak widgetów", + "no-widgets-text":"Nie znaleziono widgetów", + "management":"Zarządzanie widgetami", + "editor":"Edytor widgetów", + "confirm-to-exit-editor-html":"Masz niezapisane ustawienia widgetu.
Czy na pewno chcesz opuścić tę stronę?", + "widget-type-not-found":"Problem z ładowaniem konfiguracji widgetu.
Prawdopodobnie powiązany typ widgetu został usunięty.", + "widget-type-load-error":"Widget nie został załadowany z powodu następujących błędów:", + "remove":"Usuń widget", + "delete":"Usuń widget", + "edit":"Edytuj widget", + "remove-widget-title":"Czy na pewno chcesz usunąć widget '{{widgetTitle}}'?", + "remove-widget-text":"Po potwierdzeniu widget i wszystkie powiązane dane staną się nieodwracalne.", + "timeseries":"Serie czasowe", + "search-data":"Szukaj danych", + "no-data-found":"Nie znaleziono danych", + "latest":"Najnowsze wartości", + "rpc":"Widget sterowania", + "alarm":"Widget alarmów", + "static":"Widget statyczny", + "timeseries-short":"serie", + "latest-short":"najnowsze", + "rpc-short":"sterowanie", + "alarm-short":"alarm", + "static-short":"statyczny", + "select-widget-type":"Wybierz typ widgetu", + "missing-widget-title-error":"Tytuł widgetu musi być określony!", + "widget-saved":"Widget zapisany", + "unable-to-save-widget-error":"Nie można zapisać widgetu! Widget zawiera błędy!", + "save":"Zapisz widget", + "saveAs":"Zapisz widget jako", + "move":"Przenieś widget", + "save-widget-as":"Zapisz widget jako", + "save-widget-as-text":"Proszę wprowadzić nowy tytuł widgetu", + "toggle-fullscreen":"Przełącz pełny ekran", + "run":"Uruchom widget", + "widget-title":"Tytuł widgetu", + "title":"Tytuł", + "title-required":"Tytuł widgetu jest wymagany.", + "title-max-length":"Tytuł powinien mieć mniej niż 256 znaków", + "system":"System", + "type":"Typ widgetu", + "resources":"Zasoby", + "resource-url":"URL JavaScript/CSS", + "resource-is-module":"Jest modułem", + "remove-resource":"Usuń zasób", + "add-resource":"Dodaj zasób", + "html":"HTML", + "tidy":"Uporządkuj", + "css":"CSS", + "settings-schema":"Schemat ustawień", + "datakey-settings-schema":"Schemat ustawień klucza danych", + "latest-datakey-settings-schema":"Schemat ustawień najnowszego klucza danych", + "widget-settings":"Ustawienia widgetu", + "description":"Opis", + "tags":"Tagi", + "image-preview":"Podgląd obrazu", + "settings-form-selector":"Selektor formularza ustawień", + "data-key-settings-form-selector":"Selektor formularza ustawień klucza danych", + "latest-data-key-settings-form-selector":"Selektor formularza ustawień najnowszego klucza danych", + "all":"Wszystkie", + "actual":"Aktualne", + "deprecated":"Przestarzałe", + "has-basic-mode":"Ma tryb podstawowy", + "basic-mode-form-selector":"Selektor formularza trybu podstawowego", + "basic-mode":"Podstawowy", + "advanced-mode":"Zaawansowany", + "javascript":"Javascript", + "js":"JS", + "delete-widget-title":"Czy na pewno chcesz usunąć widget '{{widgetName}}'?", + "delete-widget-text":"Po potwierdzeniu widget i wszystkie powiązane dane staną się nieodwracalne.", + "delete-widgets-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 widget} other {# widgetów} }?", + "delete-widgets-text":"Uważaj, po potwierdzeniu wszystkie wybrane widgety zostaną usunięte, a wszystkie powiązane dane staną się nieodwracalne.", + "delete-widget":"Usuń widget", + "widget-template-load-failed-error":"Nie udało się załadować szablonu widgetu!", + "details":"Szczegóły", + "widget-details":"Szczegóły widgetu", + "add":"Dodaj widget", + "add-existing-widget":"Dodaj istniejący widget", + "add-new-widget":"Dodaj nowy widget", + "search-widgets":"Szukaj widgetów", + "selected-widgets":"{ count, plural, =1 {1 widget} other {# widgetów} } wybrano", + "undo":"Cofnij zmiany widgetu", + "export":"Eksportuj widget", + "export-widgets":"Eksportuj widgety", + "import":"Importuj widget", + "no-data":"Brak danych do wyświetlenia na widżecie", + "data-overflow":"Widget wyświetla {{count}} z {{total}} encji", + "alarm-data-overflow":"Widget wyświetla alarmy dla {{allowedEntities}} (maksymalna dozwolona) encji z {{totalEntities}} encji", + "search":"Szukaj widgetu", + "filter":"Typ filtru widgetu", + "loading-widgets":"Ładowanie widgetów...", + "widget-template-error":"Nieprawidłowy szablon HTML widgetu." + }, + "widget-action":{ + "header-button":"Przycisk nagłówka widgetu", + "open-dashboard-state":"Przejdź do nowego stanu pulpitów", + "update-dashboard-state":"Zaktualizuj bieżący stan pulpitów", + "open-dashboard":"Przejdź do innego pulpitu", + "custom":"Akcja niestandardowa", + "custom-pretty":"Akcja niestandardowa (z szablonem HTML)", + "custom-pretty-error-title":"Błąd niestandardowego okna dialogowego", + "custom-pretty-template-error":"Nieprawidłowy szablon niestandardowego okna dialogowego.", + "custom-pretty-controller-error":"Wystąpił błąd podczas oceny funkcji niestandardowego okna dialogowego.", + "mobile-action":"Akcja mobilna", + "target-dashboard-state":"Docelowy stan pulpitu", + "target-dashboard-state-required":"Docelowy stan pulpitu jest wymagany", + "set-entity-from-widget":"Ustaw encję z widgetu", + "target-dashboard":"Docelowy pulpit", + "open-right-layout":"Otwórz prawy układ pulpitu (widok mobilny)", + "state-display-type":"Opcja wyświetlania stanu pulpitu", + "open-normal":"Normalnie", + "open-in-separate-dialog":"Otwórz w osobnym oknie dialogowym", + "open-in-popover":"Otwórz w dymku", + "dialog-title":"Tytuł okna dialogowego", + "dialog-hide-dashboard-toolbar":"Ukryj pasek narzędzi pulpitu w oknie dialogowym", + "dialog-width":"Szerokość okna dialogowego w procentach względem szerokości viewportu", + "dialog-height":"Wysokość okna dialogowego w procentach względem wysokości viewportu", + "dialog-size-range-error":"Wartość procentowa rozmiaru okna dialogowego powinna być w zakresie od 1 do 100.", + "popover-preferred-placement":"Preferowane umiejscowienie dymka", + "popover-placement-top":"Góra", + "popover-placement-topLeft":"Góra lewo", + "popover-placement-topRight":"Góra prawo", + "popover-placement-right":"Prawo", + "popover-placement-rightTop":"Prawo góra", + "popover-placement-rightBottom":"Prawo dół", + "popover-placement-bottom":"Dół", + "popover-placement-bottomLeft":"Dół lewo", + "popover-placement-bottomRight":"Dół prawo", + "popover-placement-left":"Lewo", + "popover-placement-leftTop":"Lewo góra", + "popover-placement-leftBottom":"Lewo dół", + "popover-hide-on-click-outside":"Ukryj dymek po kliknięciu na zewnątrz", + "popover-hide-dashboard-toolbar":"Ukryj pasek narzędzi pulpitu w dymku", + "popover-width":"Szerokość dymka w jednostkach przeglądarki (np. 100px, 25vw)", + "popover-height":"Wysokość dymka w jednostkach przeglądarki (np. 100px, 25vh)", + "popover-style":"Styl dymka", + "open-new-browser-tab":"Otwórz w nowej karcie przeglądarki", + "mobile":{ + "action-type":"Typ akcji mobilnej", + "action-type-required":"Typ akcji mobilnej jest wymagany", + "take-picture-from-gallery":"Wybierz zdjęcie z galerii", + "take-photo":"Zrób zdjęcie", + "map-direction":"Otwórz wskazówki dojazdu na mapie", + "map-location":"Otwórz lokalizację na mapie", + "scan-qr-code":"Skanuj kod QR", + "make-phone-call":"Wykonaj połączenie telefoniczne", + "get-location":"Pobierz lokalizację telefonu", + "take-screenshot":"Zrób zrzut ekranu" + } + }, + "widgets-bundle":{ + "current":"Aktualny zestaw", + "widgets-bundles":"Zestawy widżetów", + "widgets-bundle-widgets":"Widżety zestawu widżetów", + "add":"Dodaj zestaw widżetów", + "delete":"Usuń zestaw widżetów", + "title":"Tytuł", + "title-required":"Tytuł jest wymagany.", + "title-max-length":"Tytuł powinien być krótszy niż 256", + "description":"Opis", + "image-preview":"Podgląd obrazu", + "order":"Kolejność", + "add-widgets-bundle-text":"Dodaj nowy zestaw widżetów", + "no-widgets-bundles-text":"Nie znaleziono zestawów widżetów", + "empty":"Zestaw widżetów jest pusty", + "details":"Szczegóły", + "widgets-bundle-details":"Szczegóły zestawu widżetów", + "delete-widgets-bundle-title":"Czy na pewno chcesz usunąć zestaw widżetów '{{widgetsBundleTitle}}'?", + "delete-widgets-bundle-text":"Uważaj, po potwierdzeniu zestaw widżetów oraz wszystkie powiązane dane staną się nieodwracalne.", + "delete-widgets-bundles-title":"Czy na pewno chcesz usunąć { count, plural, =1 {1 zestaw widżetów} other {# zestawy widżetów} }?", + "delete-widgets-bundles-action-title":"Usuń { count, plural, =1 {1 zestaw widżetów} other {# zestawy widżetów} }", + "delete-widgets-bundles-text":"Uważaj, po potwierdzeniu wszystkie wybrane zestawy widżetów zostaną usunięte, a wszystkie powiązane dane staną się nieodwracalne.", + "no-widgets-bundles-matching":"Nie znaleziono zestawów widżetów pasujących do '{{widgetsBundle}}'.", + "widgets-bundle-required":"Zestaw widżetów jest wymagany.", + "system":"System", + "import":"Importuj zestaw widżetów", + "export":"Eksportuj zestaw widżetów", + "export-widgets-bundle-widgets-prompt":"Dołącz widżety zestawu w eksportowanych danych (w przeciwnym razie zostaną wyeksportowane tylko odniesienia do pełnych kwalifikacji nazw widżetów)", + "export-failed-error":"Nie można wyeksportować zestawu widżetów: {{error}}", + "create-new-widgets-bundle":"Utwórz nowy zestaw widżetów", + "widgets-bundle-file":"Plik zestawu widżetów", + "invalid-widgets-bundle-file-error":"Nie można zaimportować zestawu widżetów: Nieprawidłowa struktura danych zestawu widżetów.", + "search":"Szukaj zestawów widżetów", + "selected-widgets-bundles":"{ count, plural, =1 {1 wybrany zestaw widżetów} other {# wybrane zestawy widżetów} }", + "open-widgets-bundle":"Otwórz zestaw widżetów", + "loading-widgets-bundles":"Ładowanie zestawów widżetów..." + }, + "widget-config":{ + "data":"Dane", + "settings":"Ustawienia", + "advanced":"Zaawansowane", + "appearance":"Wygląd", + "widget-card":"Karta widżetu", + "mobile":"Mobilny", + "title":"Tytuł", + "title-tooltip":"Podpowiedź tytułu", + "general-settings":"Ustawienia ogólne", + "display-title":"Wyświetl tytuł widżetu", + "card-title":"Tytuł karty", + "drop-shadow":"Cień", + "enable-fullscreen":"Włącz pełny ekran", + "background-color":"Kolor tła", + "text-color":"Kolor tekstu", + "border-radius":"Promień obramowania", + "padding":"Odstęp", + "margin":"Margines", + "widget-style":"Styl widżetu", + "widget-css":"CSS widżetu", + "title-style":"Styl tytułu", + "mobile-mode-settings":"Ustawienia trybu mobilnego", + "order":"Kolejność", + "height":"Wysokość", + "mobile-hide":"Ukryj widżet w trybie mobilnym", + "desktop-hide":"Ukryj widżet w trybie desktopowym", + "units":"Specjalny symbol obok wartości", + "units-by-default":"Domyślne jednostki", + "decimals":"Liczba miejsc po przecinku", + "decimals-by-default":"Domyślna liczba miejsc po przecinku", + "default-data-key-parameter-hint":"Ten parametr dotyczy wszystkich wartości widżetu, chyba że zostanie nadpisany przez konfigurację klucza danych", + "units-short":"Jednostki", + "decimals-short":"Miejsca po przecinku", + "decimals-suffix":"miejsca po przecinku", + "timewindow":"Okno czasowe", + "use-dashboard-timewindow":"Użyj okna czasowego dashboardu", + "use-widget-timewindow":"Użyj okna czasowego widżetu", + "display-timewindow":"Wyświetl okno czasowe", + "legend":"Legenda", + "display-legend":"Wyświetl legendę", + "datasources":"Źródła danych", + "datasource":"Źródło danych", + "maximum-datasources":"Maksymalnie { count, plural, =1 {1 źródło danych jest dozwolone.} other {# źródeł danych jest dozwolonych} }", + "timeseries-key-error":"Należy określić co najmniej jeden klucz danych szeregów czasowych", + "datasource-type":"Typ", + "datasource-parameters":"Parametry", + "remove-datasource":"Usuń źródło danych", + "add-datasource":"Dodaj źródło danych", + "target-device":"Docelowe urządzenie", + "alarm-source":"Źródło alarmu", + "actions":"Akcje", + "action":"Akcja", + "add-action":"Dodaj akcję", + "search-actions":"Szukaj akcji", + "no-actions-text":"Nie znaleziono akcji", + "action-source":"Źródło akcji", + "action-source-required":"Źródło akcji jest wymagane.", + "action-name":"Nazwa", + "action-name-required":"Nazwa akcji jest wymagana.", + "action-name-not-unique":"Inna akcja o tej samej nazwie już istnieje.
Nazwa akcji powin.", + "action-icon":"Ikona", + "show-hide-action-using-function":"Pokaż/ukryj akcję za pomocą funkcji", + "action-type":"Typ", + "action-type-required":"Typ akcji jest wymagany.", + "edit-action":"Edytuj akcję", + "delete-action":"Usuń akcję", + "delete-action-title":"Usuń akcję widżetu", + "delete-action-text":"Czy na pewno chcesz usunąć akcję widżetu o nazwie '{{actionName}}'?", + "title-icon":"Ikona tytułu", + "display-icon":"Wyświetl ikonę tytułu", + "card-icon":"Ikona karty", + "icon":"Ikona", + "icon-color":"Kolor ikony", + "icon-size":"Rozmiar ikony", + "advanced-settings":"Zaawansowane ustawienia", + "data-settings":"Ustawienia danych", + "limits":"Limity", + "no-data-display-message":"Alternatywny komunikat \"Brak danych do wyświetlenia\"", + "data-page-size":"Maksymalna liczba encji na źródło danych", + "settings-component-not-found":"Nie znaleziono komponentu formularza ustawień dla selektora '{{selector}}'", + "preview":"Podgląd", + "set":"Ustaw", + "set-message":"Ustaw komunikat", + "advanced-title-style":"Zaawansowany styl tytułu", + "card-style":"Styl karty", + "text":"Tekst", + "background":"Tło", + "advanced-widget-style":"Zaawansowany styl widżetu", + "card-buttons":"Przyciski karty", + "show-card-buttons":"Pokaż przyciski karty", + "card-border-radius":"Promień obramowania karty", + "card-appearance":"Wygląd karty", + "color":"Kolor", + "tooltip":"Podpowiedź", + "units-required":"Jednostka jest wymagana." + }, + "widget-type":{ + "import":"Importuj typ widżetu", + "export":"Eksportuj typ widżetu", + "export-failed-error":"Nie można wyeksportować widżetu: {{error}}", + "widget-file":"Plik widżetu", + "invalid-widget-file-error":"Nie można zaimportować widżetu: Nieprawidłowa struktura danych widżetu." + }, + "widgets":{ + "background":{ + "background":"Tło", + "background-settings":"Ustawienia tła", + "background-type-image":"Obraz", + "background-type-color":"Kolor", + "image-url":"URL obrazu", + "overlay":"Nakładka", + "enable-overlay":"Włącz nakładkę", + "blur":"Rozmycie", + "preview":"Podgląd" + }, + "bar-chart":{ + "bar-appearance":"Wygląd słupka", + "label-on-bar":"Etykieta na słupku", + "value-on-bar":"Wartość na słupku", + "bar-chart-card-style":"Styl karty wykresu słupkowego" + }, + "battery-level":{ + "layout":"Układ", + "layout-vertical-solid":"Pionowy. Stały", + "layout-horizontal-solid":"Poziomy. Stały", + "layout-vertical-divided":"Pionowy. Podzielony", + "layout-horizontal-divided":"Poziomy. Podzielony", + "icon":"Ikona", + "value":"Wartość", + "auto-scale":"Automatyczne skalowanie", + "battery-level-color":"Kolor poziomu baterii", + "battery-shape-color":"Kolor kształtu baterii", + "battery-level-card-style":"Styl karty poziomu baterii", + "sections-count":"Liczba sekcji" + }, + "signal-strength":{ + "value":"Wartość", + "last-update":"Ostatnia aktualizacja", + "no-signal":"Brak sygnału", + "layout":"Układ", + "layout-wifi":"Wi-Fi", + "layout-cellular-bar":"Słupkowy komórkowy", + "icon":"Ikona", + "date":"Data", + "active-bars-color":"Kolor aktywnych pasków sygnału", + "inactive-bars-color":"Kolor nieaktywnych pasków sygnału", + "signal-strength-card-style":"Styl karty siły sygnału" + }, + "chart":{ + "common-settings":"Wspólne ustawienia", + "enable-stacking-mode":"Włącz tryb układania", + "selection":"Wybór zakresu czasowego", + "enable-selection-mode":"Włącz tryb wyboru", + "line-shadow-size":"Rozmiar cienia linii", + "display-smooth-lines":"Wyświetlaj gładkie (krzywe) linie", + "default-bar-width":"Domyślna szerokość słupka dla danych niezagregowanych (milisekundy)", + "bar-alignment":"Wyrównanie słupka", + "bar-alignment-left":"Lewo", + "bar-alignment-right":"Prawo", + "bar-alignment-center":"Środek", + "default-font":"Domyślna czcionka", + "default-font-size":"Domyślny rozmiar czcionki", + "default-font-color":"Domyślny kolor czcionki", + "thresholds-line-width":"Domyślna szerokość linii dla wszystkich progów", + "tooltip-settings":"Ustawienia podpowiedzi", + "tooltip":"Podpowiedź", + "show-tooltip":"Pokaż podpowiedź", + "hover-individual-points":"Najedź na pojedyncze punkty", + "show-cumulative-values":"Pokaż wartości kumulatywne w trybie układania", + "hide-zero-false-values":"Ukryj zera/fałszywe wartości z podpowiedzi", + "tooltip-value-format-function":"Funkcja formatująca wartość podpowiedzi", + "grid-settings":"Ustawienia siatki", + "show-vertical-lines":"Pokaż linie pionowe", + "show-horizontal-lines":"Pokaż linie poziome", + "grid-outline-border-width":"Szerokość krawędzi/ramki siatki (px)", + "primary-color":"Kolor podstawowy", + "background-color":"Kolor tła", + "ticks-color":"Kolor znaczników", + "xaxis-settings":"Ustawienia osi X", + "axis-title":"Tytuł osi", + "xaxis-tick-labels-settings":"Ustawienia etykiet osi X", + "show-tick-labels":"Pokaż etykiety osi", + "yaxis-settings":"Ustawienia osi Y", + "min-scale-value":"Minimalna wartość na skali", + "max-scale-value":"Maksymalna wartość na skali", + "yaxis-tick-labels-settings":"Ustawienia etykiet osi Y", + "tick-step-size":"Rozmiar kroku między znacznikami", + "number-of-decimals":"Liczba miejsc po przecinku do wyświetlenia", + "ticks-formatter-function":"Funkcja formatująca znaczniki", + "comparison-settings":"Ustawienia porównywania", + "enable-comparison":"Włącz porównywanie", + "time-for-comparison":"Okres porównywania", + "time-for-comparison-previous-interval":"Poprzedni interwał (domyślnie)", + "time-for-comparison-days":"Dzień temu", + "time-for-comparison-weeks":"Tydzień temu", + "time-for-comparison-months":"Miesiąc temu", + "time-for-comparison-years":"Rok temu", + "time-for-comparison-custom-interval":"Niestandardowy interwał", + "custom-interval-value":"Wartość niestandardowego interwału (ms)", + "comparison-x-axis-settings":"Ustawienia osi X porównywania", + "axis-position":"Pozycja osi", + "axis-position-top":"Góra (domyślnie)", + "axis-position-bottom":"Dół", + "custom-legend-settings":"Niestandardowe ustawienia legendy", + "enable-custom-legend":"Włącz niestandardową legendę (pozwoli to na korzystanie z atrybutów/czasu rzeczywistego w etykietach kluczy)", + "key-name":"Nazwa klucza", + "key-name-required":"Nazwa klucza jest wymagana", + "key-type":"Typ klucza", + "key-type-attribute":"Atrybut", + "key-type-timeseries":"Czas rzeczywisty", + "label-keys-list":"Lista kluczy do użycia w etykietach", + "no-label-keys":"Brak skonfigurowanych kluczy", + "add-label-key":"Dodaj nowy klucz", + "line-width":"Szerokość linii", + "color":"Kolor", + "data-is-hidden-by-default":"Dane są domyślnie ukryte", + "disable-data-hiding":"Wyłącz ukrywanie danych", + "remove-from-legend":"Usuń klucz danych z legendy", + "exclude-from-stacking":"Wyłącz z układania (dostępne w trybie „Układanie”)", + "line-settings":"Ustawienia linii", + "show-line":"Pokaż linię", + "fill-line":"Wypełnij linię", + "fill-line-opacity":"Przezroczystość wypełnienia linii", + "points-settings":"Ustawienia punktów", + "show-points":"Pokaż punkty", + "points-line-width":"Szerokość linii punktów", + "points-radius":"Promień punktów", + "point-shape":"Kształt punktu", + "point-shape-circle":"Okrąg", + "point-shape-cross":"Krzyż", + "point-shape-diamond":"Diament", + "point-shape-square":"Kwadrat", + "point-shape-triangle":"Trójkąt", + "point-shape-custom":"Niestandardowa funkcja", + "point-shape-draw-function":"Funkcja rysowania kształtu punktu", + "show-separate-axis":"Pokaż oddzielną oś", + "axis-position-left":"Lewo", + "axis-position-right":"Prawo", + "thresholds":"Progi", + "no-thresholds":"Brak skonfigurowanych progów", + "add-threshold":"Dodaj próg", + "show-values-for-comparison":"Pokaż historyczne wartości do porównania", + "comparison-values-label":"Etykieta historycznych wartości", + "comparison-line-color":"Kolor linii porównawczej", + "threshold-settings":"Ustawienia progu", + "use-as-threshold":"Użyj wartości klucza jako progu", + "threshold-line-width":"Szerokość linii progu", + "threshold-color":"Kolor progu", + "common-pie-settings":"Wspólne ustawienia wykresu kołowego", + "radius":"Promień", + "inner-radius":"Wewnętrzny promień", + "tilt":"Nachylenie", + "common-pie-settings-range-error":"Wartość powinna być w zakresie od 0 do 1", + "stroke-settings":"Ustawienia obrysu", + "width-pixels":"Szerokość (piksele)", + "show-labels":"Pokaż etykiety", + "animation-settings":"Ustawienia animacji", + "animated-pie":"Włącz animację kołową (eksperymentalne)", + "border-settings":"Ustawienia obramowania", + "border-width":"Szerokość obramowania", + "border-color":"Kolor obramowania", + "legend-settings":"Ustawienia legendy", + "display-legend":"Wyświetl legendę", + "labels-font-color":"Kolor czcionki etykiet", + "series":"Seria", + "add-series":"Dodaj serię", + "series-settings":"Ustawienia serii", + "remove-series":"Usuń serię", + "no-series":"Brak skonfigurowanych serii", + "no-series-error":"Należy określić co najmniej jedną serię", + "chart-appearance":"Wygląd wykresu", + "vertical-grid-lines":"Linie siatki pionowej", + "horizontal-grid-lines":"Linie siatki poziomej", + "chart-background":"Tło wykresu", + "grid-lines-color":"Kolor linii siatki", + "border":"Obramowanie", + "axis":"Oś", + "vertical-axis":"Oś pionowa", + "ticks":"Znaczniki", + "horizontal-axis":"Oś pozioma" + }, + "color":{ + "color-settings":"Ustawienia koloru", + "color-type-constant":"Stały", + "color-type-range":"Zakres", + "color-type-function":"Funkcja", + "color":"Kolor", + "value-range":"Zakres wartości", + "from":"Od", + "to":"Do", + "color-function":"Funkcja koloru", + "copy-color-settings-from":"Skopiuj ustawienia koloru z" + }, + "dashboard-state":{ + "dashboard-state-settings":"Ustawienia stanu pulpitu", + "dashboard-state":"Identyfikator stanu pulpitu", + "autofill-state-layout":"Domyślne wypełnianie wysokości układu stanu automatycznie", + "default-margin":"Domyślny margines widżetów", + "default-background-color":"Domyślny kolor tła", + "sync-parent-state-params":"Synchronizuj parametry stanu z nadrzędnym pulpitem" + }, + "date-range-picker-settings":{ + "date-range-picker-settings":"Ustawienia wybieraka zakresu dat", + "hide-date-range-picker":"Ukryj wybierak zakresu dat", + "picker-one-panel":"Wybierak zakresu dat jednopanelowy", + "picker-auto-confirm":"Automatyczne potwierdzanie wybieraka zakresu dat", + "picker-show-template":"Pokazuj szablon wybieraka zakresu dat", + "first-day-of-week":"Pierwszy dzień tygodnia", + "interval-settings":"Ustawienia interwału", + "hide-interval":"Ukryj interwał", + "initial-interval":"Początkowy interwał", + "interval-hour":"Godzina", + "interval-day":"Dzień", + "interval-week":"Tydzień", + "interval-two-weeks":"2 tygodnie", + "interval-month":"Miesiąc", + "interval-three-months":"3 miesiące", + "interval-six-months":"6 miesięcy", + "step-settings":"Ustawienia kroku", + "hide-step-size":"Ukryj rozmiar kroku", + "initial-step-size":"Początkowy rozmiar kroku", + "hide-labels":"Ukryj etykiety", + "use-session-storage":"Użyj przechowywania sesji", + "localizationMap":{ + "Sun":"Niedz.", + "Mon":"Pon.", + "Tue":"Wt.", + "Wed":"Śr.", + "Thu":"Czw.", + "Fri":"Piąt.", + "Sat":"Sob.", + "Jan":"Sty", + "Feb":"Lut", + "Mar":"Mar", + "Apr":"Kwi", + "May":"Maj", + "Jun":"Cze", + "Jul":"Lip", + "Aug":"Sie", + "Sep":"Wrz", + "Oct":"Paź", + "Nov":"Lis", + "Dec":"Gru", + "January":"Styczeń", + "February":"Luty", + "March":"Marzec", + "April":"Kwiecień", + "June":"Czerwiec", + "July":"Lipiec", + "August":"Sierpień", + "September":"Wrzesień", + "October":"Październik", + "November":"Listopad", + "December":"Grudzień", + "Custom Date Range":"Niestandardowy zakres dat", + "Date Range Template":"Szablon zakresu dat", + "Today":"Dziś", + "Yesterday":"Wczoraj", + "This Week":"Bieżący tydzień", + "Last Week":"Ostatni tydzień", + "This Month":"Bieżący miesiąc", + "Last Month":"Ostatni miesiąc", + "Year":"Rok", + "This Year":"Bieżący rok", + "Last Year":"Ostatni rok", + "Date picker":"Wybierak dat", + "Hour":"Godzina", + "Day":"Dzień", + "Week":"Tydzień", + "2 weeks":"2 Tygodnie", + "Month":"Miesiąc", + "3 months":"3 Miesiące", + "6 months":"6 Miesięcy", + "Custom interval":"Niestandardowy interwał", + "Interval":"Interwał", + "Step size":"Rozmiar kroku", + "Ok":"Ok" + } + }, + "doughnut":{ + "total":"Suma", + "layout":"Układ", + "layout-default":"Domyślny", + "layout-with-total":"Z sumą", + "auto-scale":"Automatyczne skalowanie", + "clockwise-layout":"Układ zgodny z ruchem wskazówek zegara", + "sort-series":"Sortuj serie według etykiety", + "central-total-value":"Centralna wartość sumy", + "tooltip-value-type-absolute":"Bezwzględna", + "tooltip-value-type-percentage":"Procentowa", + "doughnut-card-style":"Styl karty pączka" + }, + "entities-hierarchy":{ + "hierarchy-data-settings":"Ustawienia danych hierarchii", + "relations-query-function":"Funkcja zapytania o relacje węzła", + "has-children-function":"Funkcja sprawdzająca, czy węzeł ma dzieci", + "node-state-settings":"Ustawienia stanu węzła", + "node-opened-function":"Domyślna funkcja otwierania węzła", + "node-disabled-function":"Funkcja dezaktywacji węzła", + "display-settings":"Ustawienia wyświetlania", + "node-icon-function":"Funkcja ikony węzła", + "node-text-function":"Funkcja tekstu węzła", + "sort-settings":"Ustawienia sortowania", + "nodes-sort-function":"Funkcja sortowania węzłów" + }, + "edge":{ + "display-default-title":"Wyświetl domyślny tytuł" + }, + "gateway":{ + "general-settings":"Ustawienia ogólne", + "widget-title":"Tytuł widżetu", + "default-archive-file-name":"Domyślna nazwa pliku archiwum", + "device-type-for-new-gateway":"Typ urządzenia dla nowej bramy", + "messages-settings":"Ustawienia komunikatów", + "save-config-success-message":"Komunikat tekstowy o pomyślnie zapisanej konfiguracji bramy", + "device-name-exists-message":"Komunikat tekstowy, gdy urządzenie o podanej nazwie już istnieje", + "gateway-title":"Formularz bramy", + "read-only":"Tylko do odczytu", + "events-title":"Tytuł formularza zdarzeń bramy", + "events-filter":"Filtr zdarzeń", + "event-key-contains":"Klucz zdarzenia zawiera...", + "show-connector":"Pokaż dla konektora", + "connector-state-param-key":"Klucz parametru stanu konektora", + "status":"Status", + "message":"Wiadomość", + "created-time":"Czas utworzenia" + }, + "gauge":{ + "default-color":"Domyślny kolor", + "radial-gauge-settings":"Ustawienia miernika radialnego", + "ticks-settings":"Ustawienia podziałek", + "min-value":"Wartość minimalna", + "max-value":"Wartość maksymalna", + "min-value-short":"min", + "max-value-short":"max", + "start-ticks-angle":"Kąt początkowy podziałek", + "ticks-angle":"Kąt podziałek", + "major-ticks":"Podziałki główne", + "major-ticks-count":"Liczba podziałek głównych", + "major-ticks-color":"Kolor podziałek głównych", + "minor-ticks":"Podziałki dodatkowe", + "minor-ticks-count":"Liczba podziałek dodatkowych", + "minor-ticks-color":"Kolor podziałek dodatkowych", + "tick-numbers-font":"Czcionka numerów podziałek", + "unit-title-settings":"Ustawienia jednostki", + "show-unit-title":"Pokaż nazwę jednostki", + "unit-title":"Nazwa jednostki", + "title-font":"Czcionka tytułu", + "units-settings":"Ustawienia jednostek", + "units-font":"Czcionka jednostek", + "value-box-settings":"Ustawienia pola wartości", + "show-value-box":"Pokaż pole wartości", + "value-box":"Pole wartości", + "value-int":"Liczba cyfr dla części całkowitej wartości", + "value-text":"Tekst wartości", + "value-text-shadow":"Cień tekstu wartości", + "value-font":"Czcionka tekstu wartości", + "rect-stroke-color-start":"Kolor obwódki prostokąta - początek gradientu", + "rect-stroke-color-end":"Kolor obwódki prostokąta - koniec gradientu", + "background-color":"Kolor tła", + "shadow-color":"Kolor cienia", + "value-box-rect-stroke-color":"Kolor obwódki prostokąta pola wartości", + "value-box-rect-stroke-color-end":"Kolor obwódki prostokąta pola wartości - koniec gradientu", + "value-box-background-color":"Kolor tła pola wartości", + "value-box-shadow-color":"Kolor cienia pola wartości", + "plate-settings":"Ustawienia tarczy", + "show-plate-border":"Pokaż krawędź tarczy", + "plate-color":"Kolor tarczy", + "needle-settings":"Ustawienia wskazówki", + "needle-circle-size":"Rozmiar koła wskazówki", + "needle-color":"Kolor wskazówki", + "needle-color-start":"Kolor wskazówki - początek gradientu", + "needle-color-end":"Kolor wskazówki - koniec gradientu", + "needle-color-shadow-up":"Kolor górnej części cienia wskazówki", + "needle-color-shadow-down":"Cień", + "highlights-settings":"Ustawienia punktów kulminacyjnych", + "highlights-width":"Szerokość punktów kulminacyjnych", + "highlights":"Punkty kulminacyjne", + "highlight-from":"Od", + "highlight-to":"Do", + "highlight-color":"Kolor", + "no-highlights":"Brak skonfigurowanych punktów kulminacyjnych", + "add-highlight":"Dodaj punkt kulminacyjny", + "animation-settings":"Ustawienia animacji", + "enable-animation":"Animacja", + "animation-duration-rule":"Czas trwania i reguła animacji", + "animation-duration":"Czas trwania animacji", + "animation-rule":"Reguła animacji", + "animation-linear":"Liniowa", + "animation-quad":"Kwadratowa", + "animation-quint":"Kwintowa", + "animation-cycle":"Cykliczna", + "animation-bounce":"Odbijająca się", + "animation-elastic":"Elastyczna", + "animation-dequad":"Odwrócona kwadratowa", + "animation-dequint":"Odwrócona kwintowa", + "animation-decycle":"Odwrócona cykliczna", + "animation-debounce":"Odwrócona odbijająca się", + "animation-delastic":"Odwrócona elastyczna", + "linear-gauge-settings":"Ustawienia miernika liniowego", + "bar-stroke":"Obwódka słupka", + "bar-stroke-width":"Szerokość obwódki słupka", + "bar-stroke-color":"Kolor obwódki słupka", + "bar-background-color":"Kolor tła słupka - początek gradientu", + "bar-background-color-end":"Kolor tła słupka - koniec gradientu", + "progress-bar-color":"Kolor paska postępu", + "progress-bar":"Pasek postępu", + "progress-bar-color-start":"Kolor paska postępu - początek gradientu", + "progress-bar-color-end":"Kolor paska postępu - koniec gradientu", + "major-ticks-names":"Nazwy podziałek głównych", + "show-stroke-ticks":"Pokaż obwódki podziałek", + "major-ticks-font":"Czcionka podziałek głównych", + "border-color":"Kolor obramowania", + "border-width":"Szerokość obramowania", + "needle-circle":"Koło wskazówki", + "needle-circle-color":"Kolor koła wskazówki", + "animation-target":"Cel animacji", + "animation-target-needle":"Wskazówka", + "animation-target-plate":"Tarcza", + "common-settings":"Wspólne ustawienia miernika", + "gauge-type":"Typ miernika", + "gauge-type-arc":"Łuk", + "gauge-type-donut":"Pączek", + "gauge-type-horizontal-bar":"Słupkowy poziomy", + "gauge-type-vertical-bar":"Słupkowy pionowy", + "donut-start-angle":"Kąt początkowy pączka", + "bar-settings":"Ustawienia słupka", + "relative-bar-width":"Względna szerokość słupka", + "neon-glow-brightness":"Jasność efektu świetlnego, (0-100), 0 - wyłączony efekt", + "stripes-thickness":"Grubość pasków, 0 - brak pasków", + "rounded-line-cap":"Użyj zaokrąglonego zakończenia linii", + "bar-color-settings":"Ustawienia koloru słupka", + "use-precise-level-color-values":"Użyj precyzyjnych poziomów kolorów", + "bar-colors":"Kolory słupków, od dolnego do górnego", + "color":"Kolor", + "no-bar-colors":"Brak skonfigurowanych kolorów słupków", + "add-bar-color":"Dodaj kolor słupka", + "from":"Od", + "to":"Do", + "fixed-level-colors":"Kolory słupków z użyciem wartości granicznych", + "gauge-title-settings":"Ustawienia tytułu miernika", + "show-gauge-title":"Pokaż tytuł miernika", + "gauge-title":"Tytuł miernika", + "gauge-title-font":"Czcionka tytułu miernika", + "unit-title-and-timestamp-settings":"Ustawienia jednostki i znacznika czasowego", + "show-timestamp":"Pokaż znacznik czasu wartości", + "timestamp-format":"Format znacznika czasu", + "label-font":"Czcionka etykiety pod wartością", + "value-settings":"Ustawienia wartości", + "show-value":"Pokaż tekst wartości", + "min-max-settings":"Ustawienia etykiet minimalnej/maksymalnej", + "show-min-max":"Pokaż wartości minimalną i maksymalną", + "min-max-font":"Czcionka etykiet minimalnej i maksymalnej", + "show-ticks":"Pokaż podziały", + "tick-width":"Szerokość podziałek", + "tick-color":"Kolor podziałek", + "tick-values":"Wartości podziałek", + "no-tick-values":"Brak skonfigurowanych wartości podziałek", + "add-tick-value":"Dodaj wartość podziałki", + "gauge-appearance":"Wygląd miernika", + "units-title":"Tytuł jednostek", + "value":"Wartość", + "ticks":"Podziały", + "arrow-and-scale-color":"Kolor strzałki i skali domyślnej", + "scale-settings":"Ustawienia skali", + "scale":"Skala", + "scale-color":"Kolory skali", + "compass-appearance":"Wygląd kompasu", + "labels":"Etykiety", + "label-style":"Styl etykiety" + }, + "gpio":{ + "pin":"Pin", + "label":"Label", + "row":"Row", + "column":"Column", + "color":"Color", + "panel-settings":"Panel settings", + "background-color":"Background color", + "gpio-switches":"GPIO switches", + "no-gpio-switches":"No GPIO switches configured", + "add-gpio-switch":"Add GPIO switch", + "gpio-status-request":"GPIO status request", + "method-name":"Method name", + "method-body":"Method body", + "gpio-status-change-request":"GPIO status change request", + "parse-gpio-status-function":"Parse gpio status function", + "gpio-leds":"GPIO leds", + "no-gpio-leds":"No GPIO leds configured", + "add-gpio-led":"Add GPIO led" + }, + "html-card":{ + "html":"HTML", + "css":"CSS" + }, + "input-widgets":{ + "attribute-not-allowed":"Parametr atrybutu nie może być używany w tym widżecie", + "blocked-location":"Geolokalizacja jest zablokowana w twojej przeglądarce", + "claim-device":"Zgłoś urządzenie", + "claim-failed":"Nie udało się zgłosić urządzenia!", + "claim-not-found":"Nie znaleziono urządzenia!", + "claim-successful":"Urządzenie zostało pomyślnie zgłoszone!", + "date":"Data", + "device-name":"Nazwa urządzenia", + "device-name-required":"Wymagana jest nazwa urządzenia", + "discard-changes":"Odrzuć zmiany", + "entity-attribute-required":"Wymagany jest atrybut encji", + "entity-coordinate-required":"Wymagane są obie pola, szerokość geograficzna i długość geograficzna", + "entity-timeseries-required":"Wymagany jest szereg czasowy encji", + "get-location":"Pobierz bieżącą lokalizację", + "invalid-date":"Nieprawidłowa data", + "latitude":"Szerokość geograficzna", + "longitude":"Długość geograficzna", + "min-value-error":"Wartość minimalna to {{value}}", + "max-value-error":"Wartość maksymalna to {{value}}", + "not-allowed-entity":"Wybrana encja nie może mieć współdzielonych atrybutów", + "no-attribute-selected":"Nie wybrano atrybutu", + "no-datakey-selected":"Nie wybrano klucza danych", + "no-coordinate-specified":"Nie określono klucza danych dla szerokości/długości geograficznej", + "no-entity-selected":"Nie wybrano encji", + "no-image":"Brak obrazu", + "no-support-geolocation":"Twoja przeglądarka nie obsługuje geolokalizacji", + "no-support-web-camera":"Twoja przeglądarka nie obsługuje kamer", + "enable-https-use-widget":"Proszę włączyć protokół HTTPS, aby korzystać z tego widżetu", + "no-found-your-camera":"Nie można znaleźć twojej kamery", + "no-permission-camera":"Użytkownik odmówił zgody / Ta witryna nie ma uprawnień do korzystania z kamery", + "no-timeseries-selected":"Nie wybrano szeregu czasowego", + "secret-key":"Tajny klucz", + "secret-key-required":"Wymagany jest tajny klucz", + "switch-attribute-value":"Przełącz wartość atrybutu encji", + "switch-camera":"Przełącz kamerę", + "switch-timeseries-value":"Przełącz wartość szeregu czasowego encji", + "take-photo":"Zrób zdjęcie", + "time":"Czas", + "timeseries-not-allowed":"Parametr szeregu czasowego nie może być używany w tym widżecie", + "update-failed":"Aktualizacja nieudana", + "update-successful":"Aktualizacja udana", + "update-attribute":"Zaktualizuj atrybut", + "update-timeseries":"Zaktualizuj szereg czasowy", + "value":"Wartość", + "general-settings":"Ustawienia ogólne", + "widget-title":"Tytuł widżetu", + "claim-button-label":"Etykieta przycisku zgłaszania", + "show-secret-key-field":"Pokaż pole wprowadzania „Tajny klucz”", + "labels-settings":"Ustawienia etykiet", + "show-labels":"Pokaż etykiety", + "device-name-label":"Etykieta pola wprowadzania nazwy urządzenia", + "secret-key-label":"Etykieta pola wprowadzania tajnego klucza", + "messages-settings":"Ustawienia wiadomości", + "claim-device-success-message":"Komunikat o udanym zgłoszeniu urządzenia", + "claim-device-not-found-message":"Komunikat, gdy urządzenie nie zostało znalezione", + "claim-device-failed-message":"Komunikat o nieudanym zgłoszeniu urządzenia", + "claim-device-name-required-message":"Komunikat błędu „Wymagana nazwa urządzenia”", + "claim-device-secret-key-required-message":"Komunikat błędu „Wymagany tajny klucz”", + "show-label":"Pokaż etykietę", + "label":"Etykieta", + "required":"Wymagane", + "required-error-message":"Komunikat błędu „Wymagane”", + "show-result-message":"Pokaż komunikat z wynikiem", + "integer-field-settings":"Ustawienia pola całkowitego", + "min-value":"Wartość minimalna", + "max-value":"Wartość maksymalna", + "double-field-settings":"Ustawienia pola liczbowego", + "text-field-settings":"Ustawienia pola tekstowego", + "min-length":"Minimalna długość", + "max-length":"Maksymalna długość", + "checkbox-settings":"Ustawienia pola wyboru", + "true-label":"Etykieta zaznaczenia", + "false-label":"Etykieta odznaczenia", + "image-input-settings":"Ustawienia wejścia obrazu", + "display-preview":"Wyświetl podgląd", + "display-clear-button":"Wyświetl przycisk Wyczyść", + "display-apply-button":"Wyświetl przycisk Zastosuj", + "display-discard-button":"Wyświetl przycisk Odrzuć", + "datetime-field-settings":"Ustawienia pola daty/czasu", + "display-time-input":"Wyświetl pole czasowe", + "latitude-key-name":"Nazwa klucza szerokości geograficznej", + "longitude-key-name":"Nazwa klucza długości geograficznej", + "show-get-location-button":"Pokaż przycisk „Pobierz bieżącą lokalizację”", + "use-high-accuracy":"Użyj wysokiej dokładności", + "location-fields-settings":"Ustawienia pól lokalizacji", + "latitude-label":"Etykieta dla szerokości geograficznej", + "longitude-label":"Etykieta dla długości geograficznej", + "input-fields-alignment":"Wyrównanie pól wprowadzania", + "input-fields-alignment-column":"Kolumna (domyślnie)", + "input-fields-alignment-row":"Rząd", + "layout":"Układ", + "row-gap":"Odstęp między rzędami w pikselach", + "column-gap":"Odstęp między kolumnami w pikselach", + "latitude-field-required":"Pole szerokości geograficznej jest wymagane", + "longitude-field-required":"Pole długości geograficznej jest wymagane", + "attribute-settings":"Ustawienia atrybutu", + "widget-mode":"Tryb widżetu", + "widget-mode-update-attribute":"Zaktualizuj atrybut", + "widget-mode-update-timeseries":"Zaktualizuj szereg czasowy", + "attribute-scope":"Zakres atrybutu", + "attribute-scope-server":"Atrybut serwera (domyślnie)", + "attribute-scope-shared":"Współdzielony atrybut", + "value-required":"Wartość wymagana", + "image-settings":"Ustawienia obrazu", + "image-format":"Format obrazu", + "image-format-jpeg":"JPEG", + "image-format-png":"PNG", + "image-format-webp":"WEBP", + "image-quality":"Jakość obrazu stosująca kompresję stratną, np. jpeg i webp", + "max-image-width":"Maksymalna szerokość obrazu", + "max-image-height":"Maksymalna wysokość obrazu", + "action-buttons":"Przyciski akcji", + "show-action-buttons":"Pokaż przyciski akcji", + "update-all-values":"Zaktualizuj wszystkie wartości, nie tylko zmodyfikowane", + "save-button-label":"Etykieta przycisku „ZAPISZ”", + "reset-button-label":"Etykieta przycisku „COFNIJ”", + "group-settings":"Ustawienia grupy", + "show-group-title":"Pokaż tytuł grupy pól związanych z różnymi encjami", + "group-title":"Tytuł grupy", + "fields-alignment":"Wyrównanie pól", + "fields-alignment-row":"Rząd (domyślnie)", + "fields-alignment-column":"Kolumna", + "fields-in-row":"Liczba pól w rzędzie", + "option-value":"Wartość (wpisz „null”, aby utworzyć pustą opcję)", + "option-label":"Etykieta", + "hide-input-field":"Ukryj pole wprowadzania", + "datakey-type":"Typ klucza danych", + "datakey-type-server":"Atrybut serwera (domyślnie)", + "datakey-type-shared":"Współdzielony atrybut", + "datakey-type-timeseries":"Szereg czasowy", + "datakey-value-type":"Typ wartości klucza danych", + "datakey-value-type-string":"Ciąg znaków", + "datakey-value-type-double":"Liczba zmiennoprzecinkowa", + "datakey-value-type-integer":"Liczba całkowita", + "datakey-value-type-json":"JSON", + "datakey-value-type-boolean-checkbox":"Boolean (Pole wyboru)", + "datakey-value-type-boolean-switch":"Boolean (Przełącznik)", + "datakey-value-type-date-time":"Data i godzina", + "datakey-value-type-date":"Data", + "datakey-value-type-time":"Czas", + "datakey-value-type-select":"Wybierz", + "datakey-value-type-color":"Kolor", + "value-is-required":"Wartość jest wymagana", + "ability-to-edit-attribute":"Zdolność do edycji atrybutu", + "ability-to-edit-attribute-editable":"Edytowalny (domyślnie)", + "ability-to-edit-attribute-disabled":"Wyłączony", + "ability-to-edit-attribute-readonly":"Tylko do odczytu", + "disable-on-datakey-name":"Wyłącz na fałszywą wartość innego klucza danych (podaj nazwę klucza danych)", + "field-appearance":"Wygląd pola", + "appearance-fill":"Wypełnienie", + "appearance-outline":"Obrys", + "subscript-sizing":"Rozmiar indeksu dolnego", + "subscript-sizing-fixed":"Stały", + "subscript-sizing-dynamic":"Dynamiczny", + "slide-toggle-settings":"Ustawienia przełącznika", + "slide-toggle-label-position":"Pozycja etykiety przełącznika", + "slide-toggle-label-position-after":"Po", + "slide-toggle-label-position-before":"Przed", + "select-options":"Opcje wyboru", + "no-select-options":"Brak skonfigurowanych opcji wyboru", + "add-select-option":"Dodaj opcję wyboru", + "numeric-field-settings":"Ustawienia pola numerycznego", + "step-interval":"Interwał kroku pomiędzy wartościami", + "error-messages":"Komunikaty o błędach", + "min-value-error-message":"Komunikat o błędzie 'Wartość minimalna'", + "max-value-error-message":"Komunikat o błędzie 'Wartość maksymalna'", + "invalid-date-error-message":"Komunikat o błędzie 'Nieprawidłowa data'", + "invalid-JSON-error-message":"Komunikat o błędzie 'Nieprawidłowy JSON'", + "icon-settings":"Ustawienia ikony", + "dialog-editor-settings":"Ustawienia edytora dialogu", + "use-custom-icon":"Użyj niestandardowej ikony", + "input-cell-icon":"Ikona do wyświetlenia przed komórką wejściową", + "value-conversion-settings":"Ustawienia konwersji wartości", + "get-value-settings":"Ustawienia pobierania wartości", + "use-get-value-function":"Użyj funkcji getValue", + "get-value-function":"Funkcja getValue", + "set-value-settings":"Ustawienia ustawiania wartości", + "use-set-value-function":"Użyj funkcji setValue", + "set-value-function":"Funkcja setValue", + "json-invalid":"Wartość JSON ma nieprawidłowy format", + "title":"Tytuł", + "cancel-button-label":"Etykieta przycisku 'Anuluj'" + }, + "invalid-qr-code-text":"Nieprawidłowy tekst wejściowy dla kodu QR. Wejście powinno być typu string.", + "qr-code":{ + "use-qr-code-text-function":"Użyj funkcji tekstowej kodu QR", + "qr-code-text-pattern":"Wzór tekstu kodu QR (np. '${entityName} | ${keyName} - jakiś tekst.')", + "qr-code-text-pattern-hint":"Wzór tekstu kodu QR używa wartości pierwszego znalezionego klucza w encjach w aliasie encji.", + "qr-code-text-pattern-required":"Wzór tekstu kodu QR jest wymagany.", + "qr-code-text-function":"Funkcja tekstu kodu QR" + }, + "label-widget":{ + "label-pattern":"Wzór", + "label-pattern-hint":"Wskazówka: na przykład 'Tekst ${keyName} jednostki.' lub ${#<index klucza>} jednostki'", + "label-pattern-required":"Wzór jest wymagany", + "label-position":"Położenie (Procentowo w stosunku do tła)", + "x-pos":"X", + "y-pos":"Y", + "background-color":"Kolor tła", + "font-settings":"Ustawienia czcionki", + "background-image":"Obraz tła", + "labels":"Etykiety", + "no-labels":"Brak skonfigurowanych etykiet", + "add-label":"Dodaj etykietę" + }, + "navigation":{ + "title":"Tytuł", + "navigation-path":"Ścieżka nawigacji", + "filter-type":"Typ filtru", + "filter-type-all":"Wszystkie elementy", + "filter-type-include":"Zawiera elementy", + "filter-type-exclude":"Wyklucza elementy", + "items":"Elementy", + "enter-urls-to-filter":"Wprowadź adresy URL do filtrowania..." + }, + "persistent-table":{ + "rpc-id":"ID RPC", + "message-type":"Typ wiadomości", + "method":"Metoda", + "params":"Parametry", + "created-time":"Czas utworzenia", + "expiration-time":"Czas wygaśnięcia", + "retries":"Próby", + "status":"Status", + "filter":"Filtr", + "refresh":"Odśwież", + "add":"Dodaj żądanie RPC", + "details":"Szczegóły", + "delete":"Usuń", + "delete-request-title":"Usuń trwałe żądanie RPC", + "delete-request-text":"Czy na pewno chcesz usunąć to żądanie?", + "details-title":"Szczegóły ID RPC: ", + "additional-info":"Dodatkowe informacje", + "response":"Odpowiedź", + "any-status":"Dowolny status", + "rpc-status-list":"Lista statusów RPC", + "no-request-prompt":"Brak żądań do wyświetlenia", + "send-request":"Wyślij żądanie", + "add-title":"Utwórz trwałe żądanie RPC", + "method-error":"Wymagana jest metoda.", + "timeout-error":"Minimalna wartość czasu oczekiwania to 5000 (5 sekund).", + "white-space-error":"Biała przestrzeń nie jest dozwolona.", + "rpc-status":{ + "QUEUED":"W KOLEJCE", + "SENT":"WYSŁANE", + "DELIVERED":"DOSTARCZONE", + "SUCCESSFUL":"UDANE", + "TIMEOUT":"PRZEKROCZONY LIMIT CZASU", + "EXPIRED":"WYGASŁE", + "FAILED":"NIEUDANE" + }, + "rpc-search-status-all":"WSZYSTKO", + "message-types":{ + "false":"Dwukierunkowe", + "true":"Jednokierunkowe" + }, + "general-settings":"Ustawienia ogólne", + "enable-filter":"Włącz filtr", + "enable-sticky-header":"Wyświetl nagłówek podczas przewijania", + "enable-sticky-action":"Wyświetl kolumnę akcji podczas przewijania", + "display-request-details":"Wyświetl szczegóły żądania", + "allow-send-request":"Zezwalaj na wysyłanie żądań RPC", + "allow-delete-request":"Zezwalaj na usuwanie żądań", + "columns-settings":"Ustawienia kolumn", + "display-columns":"Wyświetlane kolumny", + "column":"Kolumna", + "no-columns-found":"Nie znaleziono kolumn", + "no-columns-matching":"'{{column}}' nie znaleziono." + }, + "range-chart":{ + "chart":"Wykres", + "data-zoom":"Powiększenie danych", + "range-colors":"Kolory zakresu", + "out-of-range-color":"Kolor poza zakresem", + "fill-area":"Wypełnij obszar", + "range-chart-card-style":"Styl karty wykresu zakresu" + }, + "rpc":{ + "value-settings":"Ustawienia wartości", + "initial-value":"Początkowa wartość", + "retrieve-value-settings":"Ustawienia pobierania włączonej/wyłączonej wartości", + "retrieve-value-method":"Pobierz wartość za pomocą metody", + "retrieve-value-method-none":"Nie pobieraj", + "retrieve-value-method-rpc":"Wywołaj metodę pobierania wartości RPC", + "retrieve-value-method-attribute":"Subskrybuj atrybut", + "retrieve-value-method-timeseries":"Subskrybuj szereg czasowy", + "attribute-value-key":"Klucz atrybutu", + "timeseries-value-key":"Klucz szeregu czasowego", + "get-value-method":"Metoda RPC pobierz wartość", + "parse-value-function":"Funkcja analizy wartości", + "update-value-settings":"Ustawienia aktualizacji wartości", + "set-value-method":"Metoda RPC ustaw wartość", + "convert-value-function":"Funkcja konwersji wartości", + "rpc-settings":"Ustawienia RPC", + "request-timeout":"Limit czasu żądania RPC (ms)", + "persistent-rpc-settings":"Ustawienia trwałego RPC", + "request-persistent":"Trwałe żądanie RPC", + "persistent-polling-interval":"Interwał odpytywania (ms) w celu uzyskania odpowiedzi na trwałe polecenie RPC", + "common-settings":"Wspólne ustawienia", + "switch-title":"Tytuł przełącznika", + "show-on-off-labels":"Pokaż etykiety włącz/wyłącz", + "slide-toggle-label":"Etykieta przycisku przełącznika", + "label-position":"Pozycja etykiety", + "label-position-before":"Przed", + "label-position-after":"Po", + "slider-color":"Kolor suwaka", + "slider-color-primary":"Podstawowy", + "slider-color-accent":"Akcent", + "slider-color-warn":"Ostrzeżenie", + "button-style":"Styl przycisku", + "button-raised":"Podniesiony przycisk", + "button-primary":"Podstawowy kolor", + "button-background-color":"Kolor tła przycisku", + "button-text-color":"Kolor tekstu przycisku", + "widget-title":"Tytuł widżetu", + "button-label":"Etykieta przycisku", + "device-attribute-scope":"Zakres atrybutu urządzenia", + "server-attribute":"Atrybut serwera", + "shared-attribute":"Atrybut wspólny", + "device-attribute-parameters":"Parametry atrybutu urządzenia", + "is-one-way-command":"Jest to polecenie jednokierunkowe", + "rpc-method":"Metoda RPC", + "rpc-method-params":"Parametry metody RPC", + "show-rpc-error":"Pokaż błąd wykonania polecenia RPC", + "led-title":"Tytuł diody LED", + "led-color":"Kolor diody LED", + "check-status-settings":"Ustawienia sprawdzania statusu", + "perform-rpc-status-check":"Wykonaj sprawdzanie statusu urządzenia RPC", + "retrieve-led-status-value-method":"Pobierz stan diody LED za pomocą metody", + "led-status-value-attribute":"Atrybut urządzenia zawierający stan diody LED", + "led-status-value-timeseries":"Szereg czasowy urządzenia zawierający stan diody LED", + "check-status-method":"Metoda sprawdzania statusu urządzenia RPC", + "parse-led-status-value-function":"Funkcja analizy stanu diody LED", + "knob-title":"Tytuł pokrętła", + "min-value":"Minimalna wartość", + "max-value":"Maksymalna wartość" + }, + "maps":{ + "select-entity":"Wybierz jednostkę", + "select-entity-hint":"Wskazówka: po wybraniu kliknij na mapie, aby ustawić pozycję", + "tooltips":{ + "placeMarker":"Kliknij, aby umieścić jednostkę '{{entityName}}'", + "firstVertex":"Wielokąt dla '{{entityName}}': kliknij, aby umieścić pierwszy punkt", + "firstVertex-cut":"Kliknij, aby umieścić pierwszy punkt", + "continueLine":"Wielokąt dla '{{entityName}}': kliknij, aby kontynuować rysowanie", + "continueLine-cut":"Kliknij, aby kontynuować rysowanie", + "finishLine":"Kliknij na istniejący znacznik, aby zakończyć", + "finishPoly":"Wielokąt dla '{{entityName}}': kliknij na pierwszy znacznik, aby zakończyć i zapisać", + "finishPoly-cut":"Kliknij na pierwszy znacznik, aby zakończyć i zapisać", + "finishRect":"Wielokąt dla '{{entityName}}': kliknij, aby zakończyć i zapisać", + "startCircle":"Okrąg dla '{{entityName}}': kliknij, aby umieścić środek okręgu", + "finishCircle":"Okrąg dla '{{entityName}}': kliknij, aby zakończyć okrąg", + "placeCircleMarker":"Kliknij, aby umieścić znacznik okręgu" + }, + "actions":{ + "finish":"Zakończ", + "cancel":"Anuluj", + "removeLastVertex":"Usuń ostatni punkt" + }, + "buttonTitles":{ + "drawMarkerButton":"Umieść obiekt", + "drawPolyButton":"Utwórz wielokąt", + "drawLineButton":"Utwórz linię", + "drawCircleButton":"Utwórz okrąg", + "drawRectButton":"Utwórz prostokąt", + "editButton":"Tryb edycji", + "dragButton":"Tryb przeciągania", + "cutButton":"Odcinanie obszaru wielokąta", + "deleteButton":"Usuń", + "drawCircleMarkerButton":"Utwórz znacznik okręgu", + "rotateButton":"Obróć wielokąt" + }, + "map-provider-settings":"Ustawienia dostawcy map", + "map-provider":"Dostawca map", + "map-provider-google":"Google Maps", + "map-provider-openstreet":"OpenStreet Maps", + "map-provider-here":"HERE Maps", + "map-provider-image":"Mapa obrazu", + "map-provider-tencent":"Tencent Maps", + "openstreet-provider":"Dostawca mapy OpenStreet", + "openstreet-provider-mapnik":"OpenStreetMap.Mapnik (Domyślny)", + "openstreet-provider-hot":"OpenStreetMap.HOT", + "openstreet-provider-esri-street":"Esri.WorldStreetMap", + "openstreet-provider-esri-topo":"Esri.WorldTopoMap", + "openstreet-provider-esri-imagery":"Esri.WorldImagery", + "openstreet-provider-cartodb-positron":"CartoDB.Positron", + "openstreet-provider-cartodb-dark-matter":"CartoDB.DarkMatter", + "use-custom-provider":"Użyj dostawcy niestandardowego", + "custom-provider-tile-url":"Niestandardowy adres URL kafelka dostawcy", + "google-maps-api-key":"Klucz API Google Maps", + "default-map-type":"Domyślny rodzaj mapy", + "google-map-type-roadmap":"Mapa drogowa", + "google-map-type-satelite":"Satelita", + "google-map-type-hybrid":"Hybrydowa", + "google-map-type-terrain":"Tereno", + "map-layer":"Warstwa mapy", + "here-map-normal-day":"HERE.normalDay (Domyślna)", + "here-map-normal-night":"HERE.normalNight", + "here-map-hybrid-day":"HERE.hybridDay", + "here-map-terrain-day":"HERE.terrainDay", + "credentials":"Poświadczenia", + "here-app-id":"ID aplikacji HERE", + "here-app-code":"Kod aplikacji HERE", + "here-api-key":"Klucz API HERE", + "here-use-new-version-api-3":"Użyj wersji API 3", + "tencent-maps-api-key":"Klucz API Tencent Maps", + "tencent-map-type-roadmap":"Mapa drogowa", + "tencent-map-type-satelite":"Satelita", + "tencent-map-type-hybrid":"Hybrydowa", + "image-map-background":"Tło mapy obrazu", + "image-map-background-from-entity-attribute":"Użyj tła mapy obrazu z atrybutu encji", + "image-url-source-entity-alias":"Źródło URL obrazu z aliasu encji", + "image-url-source-entity-attribute":"Źródło URL obrazu z atrybutu encji", + "common-map-settings":"Wspólne ustawienia mapy", + "x-pos-key-name":"Nazwa klucza X", + "y-pos-key-name":"Nazwa klucza Y", + "latitude-key-name":"Nazwa klucza szerokości geograficznej", + "longitude-key-name":"Nazwa klucza długości geograficznej", + "default-map-zoom-level":"Domyślny poziom przybliżenia mapy (0 - 20)", + "default-map-center-position":"Domyślna pozycja centralna mapy (0,0)", + "disable-scroll-zooming":"Wyłącz przybliżanie za pomocą przewijania", + "disable-double-click-zooming":"Wyłącz przybliżanie podwójnym kliknięciem", + "disable-zoom-control-buttons":"Wyłącz przyciski sterowania przybliżeniem", + "fit-map-bounds":"Dopasuj granice mapy, aby pokryć wszystkie markery", + "use-default-map-center-position":"Użyj domyślnej pozycji centralnej mapy", + "entities-limit":"Limit encji do wczytania", + "markers-settings":"Ustawienia znaczników", + "marker-offset-x":"Przesunięcie X znacznika względem pozycji pomnożone przez szerokość znacznika", + "marker-offset-y":"Przesunięcie Y znacznika względem pozycji pomnożone przez wysokość znacznika", + "position-function":"Funkcja konwersji pozycji, powinna zwracać współrzędne x, y jako liczby z zakresu od 0 do 1", + "draggable-marker":"Znacznik do przeciągania", + "label":"Etykieta", + "show-label":"Pokaż etykietę", + "use-label-function":"Użyj funkcji etykiety", + "label-pattern":"Etykieta (przykłady wzorców: '${entityName}', '${entityName}: (Tekst ${keyName} jednostki.)' )", + "label-function":"Funkcja etykiety", + "tooltip":"Podpowiedź", + "show-tooltip":"Pokaż podpowiedź", + "show-tooltip-action":"Działanie wyświetlania podpowiedzi", + "show-tooltip-action-click":"Pokaż podpowiedź po kliknięciu (Domyślnie)", + "show-tooltip-action-hover":"Pokaż podpowiedź po najechaniu", + "auto-close-tooltips":"Automatyczne zamykanie podpowiedzi", + "use-tooltip-function":"Użyj funkcji podpowiedzi", + "tooltip-pattern":"Podpowiedź (np. 'Tekst ${keyName} jednostki.' lub Tekst linku')", + "tooltip-function":"Funkcja podpowiedzi", + "tooltip-offset-x":"Przesunięcie X podpowiedzi względem kotwicy znacznika pomnożone przez szerokość znacznika", + "tooltip-offset-y":"Przesunięcie Y podpowiedzi względem kotwicy znacznika pomnożone przez wysokość znacznika", + "color":"Kolor", + "use-color-function":"Użyj funkcji koloru", + "color-function":"Funkcja koloru", + "marker-image":"Obraz znacznika", + "use-marker-image-function":"Użyj funkcji obrazu znacznika", + "custom-marker-image":"Niestandardowy obraz znacznika", + "custom-marker-image-size":"Niestandardowy rozmiar obrazu znacznika (px)", + "marker-image-function":"Funkcja obrazu znacznika", + "marker-images":"Obrazy znaczników", + "polygon-settings":"Ustawienia wielokąta", + "show-polygon":"Pokaż wielokąt", + "polygon-key-name":"Nazwa klucza wielokąta", + "enable-polygon-edit":"Włącz edycję wielokąta", + "polygon-label":"Etykieta wielokąta", + "show-polygon-label":"Pokaż etykietę wielokąta", + "use-polygon-label-function":"Użyj funkcji etykiety wielokąta", + "polygon-label-pattern":"Etykieta wielokąta (przykłady wzorców: '${entityName}', '${entityName}: (Tekst ${keyName} jednostki.)' )", + "polygon-label-function":"Funkcja etykiety wielokąta", + "polygon-tooltip":"Podpowiedź wielokąta", + "show-polygon-tooltip":"Pokaż podpowiedź wielokąta", + "auto-close-polygon-tooltips":"Automatyczne zamykanie podpowiedzi wielokąta", + "use-polygon-tooltip-function":"Użyj funkcji podpowiedzi wielokąta", + "polygon-tooltip-pattern":"Podpowiedź (np. 'Tekst ${keyName} jednostki.' lub Tekst linku')", + "polygon-tooltip-function":"Funkcja podpowiedzi wielokąta", + "polygon-color":"Kolor wielokąta", + "polygon-opacity":"Przezroczystość wielokąta", + "use-polygon-color-function":"Użyj funkcji koloru wielokąta", + "polygon-color-function":"Funkcja koloru wielokąta", + "polygon-stroke":"Obrys wielokąta", + "stroke-color":"Kolor obrysu", + "stroke-opacity":"Przezroczystość obrysu", + "stroke-weight":"Grubość obrysu", + "use-polygon-stroke-color-function":"Użyj funkcji koloru obrysu wielokąta", + "polygon-stroke-color-function":"Funkcja koloru obrysu wielokąta", + "circle-settings":"Ustawienia okręgu", + "show-circle":"Pokaż okrąg", + "circle-key-name":"Nazwa klucza okręgu", + "enable-circle-edit":"Włącz edycję okręgu", + "circle-label":"Etykieta okręgu", + "show-circle-label":"Pokaż etykietę okręgu", + "use-circle-label-function":"Użyj funkcji etykiety okręgu", + "circle-label-pattern":"Etykieta okręgu (przykłady wzorców: '${entityName}', '${entityName}: (Tekst ${keyName} jednostki.)' )", + "circle-label-function":"Funkcja etykiety okręgu", + "circle-tooltip":"Podpowiedź okręgu", + "show-circle-tooltip":"Pokaż podpowiedź okręgu", + "auto-close-circle-tooltips":"Automatyczne zamykanie podpowiedzi okręgu", + "use-circle-tooltip-function":"Użyj funkcji podpowiedzi okręgu", + "circle-tooltip-pattern":"Podpowiedź (np. 'Tekst ${keyName} jednostki.' lub Tekst linku')", + "circle-tooltip-function":"Funkcja podpowiedzi okręgu", + "circle-fill-color":"Kolor wypełnienia okręgu", + "circle-fill-color-opacity":"Przezroczystość koloru wypełnienia okręgu", + "use-circle-fill-color-function":"Użyj funkcji koloru wypełnienia okręgu", + "circle-fill-color-function":"Funkcja koloru wypełnienia okręgu", + "circle-stroke":"Obrys okręgu", + "use-circle-stroke-color-function":"Użyj funkcji koloru obrysu okręgu", + "circle-stroke-color-function":"Funkcja koloru obrysu okręgu", + "markers-clustering-settings":"Ustawienia grupowania znaczników", + "use-map-markers-clustering":"Użyj grupowania znaczników na mapie", + "zoom-on-cluster-click":"Powiększ po kliknięciu na klastrze", + "max-cluster-zoom":"Maksymalny poziom powiększenia, przy którym znacznik może być częścią klastra (0 - 18)", + "max-cluster-radius-pixels":"Maksymalny promień, który może obejmować klaster w pikselach", + "cluster-zoom-animation":"Pokaż animację znaczników podczas przybliżania", + "show-markers-bounds-on-cluster-mouse-over":"Pokaż granice znaczników po najechaniu myszą na klaster", + "spiderfy-max-zoom-level":"Rozpoznaj na najwyższym poziomie powiększenia (aby zobaczyć wszystkie znaczniki klastra)", + "load-optimization":"Optymalizacja ładowania", + "cluster-chunked-loading":"Użyj fragmentów do dodawania znaczników, aby strona się nie zawiesiła", + "cluster-markers-lazy-load":"Użyj ładowania opóźnionego do dodawania znaczników", + "editor-settings":"Ustawienia edytora", + "enable-snapping":"Włącz przyciąganie do innych wierzchołków dla precyzyjnego rysowania", + "init-draggable-mode":"Inicjalizuj mapę w trybie przeciągania", + "hide-all-edit-buttons":"Ukryj wszystkie przyciski edycji", + "hide-draw-buttons":"Ukryj przyciski rysowania", + "hide-edit-buttons":"Ukryj przyciski edycji", + "hide-remove-button":"Ukryj przycisk usuwania", + "route-map-settings":"Ustawienia mapy trasy", + "trip-animation-settings":"Ustawienia animacji podróży", + "normalization-step":"Krok normalizacji danych (ms)", + "tooltip-background-color":"Kolor tła podpowiedzi", + "tooltip-font-color":"Kolor czcionki podpowiedzi", + "tooltip-opacity":"Przezroczystość podpowiedzi (0-1)", + "auto-close-tooltip":"Automatyczne zamykanie podpowiedzi", + "rotation-angle":"Ustaw dodatkowy kąt obrotu dla znacznika (stopnie)", + "path-settings":"Ustawienia ścieżki", + "path-color":"Kolor ścieżki", + "use-path-color-function":"Użyj funkcji koloru ścieżki", + "path-color-function":"Funkcja koloru ścieżki", + "path-decorator":"Dekorator ścieżki", + "use-path-decorator":"Użyj dekoratora ścieżki", + "decorator-symbol":"Symbol dekoratora", + "decorator-symbol-arrow-head":"Strzała", + "decorator-symbol-dash":"Kreska", + "decorator-symbol-size":"Rozmiar symbolu dekoratora (px)", + "use-path-decorator-custom-color":"Użyj niestandardowego koloru dekoratora ścieżki", + "decorator-custom-color":"Niestandardowy kolor dekoratora", + "decorator-offset":"Przesunięcie dekoratora", + "end-decorator-offset":"Przesunięcie końcowe dekoratora", + "decorator-repeat":"Powtórzenie dekoratora", + "points-settings":"Ustawienia punktów", + "show-points":"Pokaż punkty", + "point-color":"Kolor punktu", + "point-size":"Rozmiar punktu (px)", + "use-point-color-function":"Użyj funkcji koloru punktu", + "point-color-function":"Funkcja koloru punktu", + "use-point-as-anchor":"Użyj punktu jako kotwicy", + "point-as-anchor-function":"Funkcja punktu jako kotwicy", + "independent-point-tooltip":"Niezależna podpowiedź punktu", + "clustering-markers":"Klastrowanie znaczników", + "use-icon-create-function":"Użyj funkcji koloru znaczników", + "marker-color-function":"Funkcja koloru znacznika" + }, + "markdown":{ + "use-markdown-text-function":"Użyj funkcji wartości markdown/HTML", + "markdown-text-function":"Funkcja wartości markdown/HTML", + "markdown-text-pattern":"Wzorzec markdown/HTML (markdown lub HTML z zmiennymi, np. '${entityName} lub ${keyName} - jakiś tekst.')", + "apply-default-markdown-style":"Zastosuj domyślny styl markdown", + "markdown-css":"CSS markdown/HTML" + }, + "simple-card":{ + "label":"Etykieta", + "label-position":"Pozycja etykiety", + "label-position-left":"Po lewej", + "label-position-top":"Na górze" + }, + "value-card":{ + "layout":"Układ", + "layout-square":"Kwadratowy", + "layout-vertical":"Pionowy", + "layout-centered":"Wyśrodkowany", + "layout-simplified":"Uproszczony", + "layout-horizontal":"Poziomy", + "layout-horizontal-reversed":"Odwrócony poziomy", + "label":"Etykieta", + "icon":"Ikona", + "value":"Wartość", + "date":"Data", + "value-card-style":"Styl karty wartości", + "auto-scale":"Automatyczne dostosowanie skali" + }, + "liquid-level-card":{ + "layout-simple":"Prosty", + "layout-percentage":"Procentowy", + "layout-absolute":"Bezwzględny", + "layout":"Układ", + "background-overlay":"Nakładka na tło wartości", + "total-volume":"Całkowita objętość", + "tank":"Zbiornik", + "shape":"Kształt", + "datasource-units":"Jednostki źródła danych", + "widget-units":"Jednostki widżetu", + "decimals":"Miejsca dziesiętne", + "liquid":"Ciecz", + "liquid-color":"Kolor cieczy", + "value":"Wartość", + "value-font":"Czcionka wartości", + "level":"Poziom", + "last-update":"Ostatnia aktualizacja", + "shape-by-attribute":"Ustaw kształt zbiornika według nazwy atrybutu", + "tooltip-background":"Kolor tła", + "background-blur":"Rozmycie tła", + "tank-color":"Kolor zbiornika", + "static":"Statyczny", + "see-examples":"Zobacz przykłady", + "attribute":"Atrybut", + "shape-type":"Typ", + "v-oval":"Pionowy Owal", + "v-cylinder":"Pionowy Cylinder", + "v-capsule":"Pionowa Kapsuła", + "rectangle":"Prostokąt", + "h-oval":"Poziomy Owal", + "h-ellipse":"Pozioma Elipsa", + "h-dish-ends":"Poziome Zakończenia Dzbanka", + "h-cylinder":"Poziomy Cylinder", + "h-capsule":"Pozioma Kapsuła", + "h-elliptical_2_1":"Pozioma Elipsa 2:1", + "icon":"Ikona karty", + "title":"Tytuł karty", + "units":"Jednostki", + "color-and-font":"Kolor i czcionka", + "shape-attribute-name":"Nazwa atrybutu", + "total-volume-required":"Wymagana jest całkowita objętość.", + "attribute-name-required":"Wymagana jest nazwa atrybutu.", + "attribute-key-not-set":"Klucz atrybutu '{{attributeName}}' nie jest ustawiony", + "attribute-key-invalid":"Klucz atrybutu '{{attributeName}}' jest nieprawidłowy" + }, + "aggregated-value-card":{ + "subtitle":"Podtytuł", + "chart":"Wykres", + "values":"Wartości", + "value-appearance":"Wygląd wartości", + "position":"Pozycja", + "position-center":"Środek", + "position-right-top":"Prawy górny róg", + "position-right-bottom":"Prawy dolny róg", + "position-left-top":"Lewy górny róg", + "position-left-bottom":"Lewy dolny róg", + "font":"Czcionka", + "color":"Kolor", + "arrow":"Strzałka", + "display-up-down-arrow":"Wyświetl strzałkę w górę/dół", + "add-value":"Dodaj wartość", + "remove-value":"Usuń wartość", + "no-values":"Brak skonfigurowanych wartości", + "aggregation":"Agregacja", + "aggregated-value-card-style":"Styl karty zagregowanej wartości", + "auto-scale":"Automatyczne skalowanie" + }, + "value-chart-card":{ + "layout":"Układ", + "layout-left":"Lewo", + "layout-right":"Prawo", + "auto-scale":"Automatyczna skala", + "icon":"Ikona", + "value":"Wartość", + "chart":"Wykres", + "value-chart-card-style":"Styl karty wartości z wykresem" + }, + "progress-bar":{ + "layout":"Układ", + "layout-default":"Domyślny", + "layout-simplified":"Uproszczony", + "auto-scale":"Automatyczna skala", + "icon":"Ikona", + "value":"Wartość", + "range":"Zakres", + "min":"min", + "max":"max", + "range-ticks":"Podziałka zakresu", + "bar":"Pasek", + "bar-color":"Kolor paska", + "bar-background":"Tło paska", + "progress-bar-card-style":"Styl karty paska postępu" + }, + "alarm-count":{ + "alarm-count-card-style":"Styl karty licznika alarmów" + }, + "entity-count":{ + "entity-count-card-style":"Entity count card style" + }, + "count":{ + "layout":"Układ", + "layout-column":"Kolumna", + "layout-row":"Wiersz", + "label":"Etykieta", + "icon":"Ikona", + "icon-background":"Tło ikony", + "value":"Wartość", + "chevron":"Strzałka", + "auto-scale":"Automatyczna skala" + }, + "table":{ + "common-table-settings":"Wspólne ustawienia tabeli", + "enable-search":"Włącz wyszukiwanie", + "enable-sticky-header":"Zawsze wyświetlaj nagłówek", + "enable-sticky-action":"Zawsze wyświetlaj kolumnę akcji", + "hidden-cell-button-display-mode":"Tryb wyświetlania ukrytego przycisku akcji w komórce", + "show-empty-space-hidden-action":"Pokaż pustą przestrzeń zamiast ukrytego przycisku akcji w komórce", + "dont-reserve-space-hidden-action":"Nie rezerwuj miejsca na ukryte przyciski akcji", + "display-timestamp":"Znak czasu", + "display-pagination":"Wyświetl paginację", + "default-page-size":"Domyślny rozmiar strony", + "use-entity-label-tab-name":"Użyj etykiety encji w nazwie karty", + "hide-empty-lines":"Ukryj puste wiersze", + "row-style":"Styl wiersza", + "use-row-style-function":"Użyj funkcji stylu wiersza", + "row-style-function":"Funkcja stylu wiersza", + "cell-style":"Styl komórki", + "use-cell-style-function":"Użyj funkcji stylu komórki", + "cell-style-function":"Funkcja stylu komórki", + "cell-content":"Zawartość komórki", + "use-cell-content-function":"Użyj funkcji zawartości komórki", + "cell-content-function":"Funkcja zawartości komórki", + "show-latest-data-column":"Pokaż kolumnę z najnowszymi danymi", + "latest-data-column-order":"Kolejność kolumny z najnowszymi danymi", + "entities-table-title":"Tytuł tabeli encji", + "enable-select-column-display":"Włącz wybór kolumn do wyświetlenia", + "display-entity-name":"Wyświetl kolumnę z nazwą encji", + "entity-name-column-title":"Tytuł kolumny z nazwą encji", + "display-entity-label":"Wyświetl kolumnę z etykietą encji", + "entity-label-column-title":"Tytuł kolumny z etykietą encji", + "display-entity-type":"Wyświetl kolumnę z typem encji", + "default-sort-order":"Domyślna kolejność sortowania", + "custom-title":"Niestandardowy tytuł nagłówka", + "column-width":"Szerokość kolumny (px lub %)", + "default-column-visibility":"Domyślna widoczność kolumny", + "column-visibility-visible":"Widoczna", + "column-visibility-hidden":"Ukryta", + "column-visibility-hidden-mobile":"Ukryta w trybie mobilnym", + "column-selection-to-display":"Wybór kolumn w 'Kolumny do wyświetlenia'", + "column-selection-to-display-enabled":"Włączony", + "column-selection-to-display-disabled":"Wyłączony", + "alarms-table-title":"Tytuł tabeli alarmów", + "enable-alarms-selection":"Włącz wybór alarmów", + "enable-alarms-search":"Włącz wyszukiwanie alarmów", + "enable-alarm-filter":"Włącz filtr alarmów", + "display-alarm-details":"Wyświetl szczegóły alarmu", + "allow-alarms-ack":"Zezwalaj na potwierdzanie alarmów", + "allow-alarms-clear":"Zezwalaj na usuwanie alarmów", + "display-alarm-activity":"Wyświetl aktywność alarmu", + "allow-alarms-assign":"Zezwalaj na przypisywanie alarmów", + "columns":"Kolumny", + "column-settings":"Ustawienia kolumn", + "remove-column":"Usuń kolumnę", + "add-column":"Dodaj kolumnę", + "no-columns":"Brak skonfigurowanych kolumn", + "columns-to-display":"Kolumny do wyświetlenia", + "table-header":"Nagłówek tabeli", + "header-buttons":"Przyciski nagłówka", + "table-buttons":"Przyciski tabeli", + "pagination":"Paginacja", + "rows":"Wiersze", + "timeseries-column-error":"Należy określić co najmniej jedną kolumnę szeregów czasowych", + "alarm-column-error":"Należy określić co najmniej jedną kolumnę alarmów", + "table-tabs":"Karty tabeli", + "show-cell-actions-menu-mobile":"Pokaż menu rozwijane akcji komórek w trybie mobilnym" + }, + "wind-speed-direction":{ + "layout":"Układ", + "layout-default":"Domyślny", + "layout-advanced":"Zaawansowany", + "layout-simplified":"Uproszczony", + "values":"Wartości", + "wind-direction":"Kierunek wiatru", + "center-value":"Wartość środkowa", + "icon":"Ikona", + "arrow":"Strzałka", + "ticks":"Kreski", + "labels-type":"Typ etykiet", + "directional-names":"Nazwy kierunkowe", + "degrees":"Stopnie", + "major-ticks":"Główne kreski", + "minor-ticks":"Drobne kreski", + "wind-speed-direction-card-style":"Styl karty prędkości i kierunku wiatru", + "ticks-color":"Kolor kresek", + "ticks-labels-type":"Typ etykiet kreskowych", + "arrow-color":"Kolor strzałki" + }, + "value-source":{ + "value-source":"Źródło wartości", + "predefined-value":"Wartość predefiniowana", + "entity-attribute":"Atrybut jednostki", + "value":"Wartość", + "source-entity-alias":"Alias jednostki źródłowej", + "source-entity-attribute":"Atrybut jednostki źródłowej" + }, + "widget-font":{ + "font-settings":"Ustawienia czcionki", + "font-family":"Rodzina czcionek", + "size":"Rozmiar", + "relative-font-size":"Względny rozmiar czcionki (procenty)", + "font-style":"Styl", + "font-style-normal":"Normalny", + "font-style-italic":"Kursywa", + "font-style-oblique":"Pochyły", + "font-weight":"Grubość", + "font-weight-normal":"Normalna", + "font-weight-bold":"Pogrubiona", + "font-weight-bolder":"Grubsza", + "font-weight-lighter":"Lżejsza", + "color":"Kolor", + "shadow-color":"Kolor cienia", + "preview":"Podgląd", + "line-height":"Wysokość wiersza", + "auto":"Automatyczne" + }, + "home":{ + "no-data-available":"Brak dostępnych danych" + }, + "system-info":{ + "cpu":"Procesor", + "ram":"RAM", + "disk":"Dysk", + "cpu-warning-text":"Wysokie zużycie procesora. Aby uniknąć awarii systemu, zoptymalizuj wydajność systemu.", + "cpu-critical-text":"Krytycznie wysokie zużycie procesora. Aby uniknąć awarii systemu, zoptymalizuj wydajność systemu.", + "ram-warning-text":"Niski zapas pamięci RAM. Aby uniknąć awarii systemu, zoptymalizuj wydajność systemu lub zwiększ rozmiar pamięci RAM.", + "ram-critical-text":"Krytycznie niski zapas pamięci RAM. Aby uniknąć awarii systemu, zoptymalizuj wydajność systemu lub zwiększ rozmiar pamięci RAM.", + "disk-warning-text":"Niskie miejsce na dysku. Aby uniknąć utraty danych, zwolnij miejsce lub zwiększ rozmiar dysku.", + "disk-critical-text":"Krytycznie niskie miejsce na dysku. Aby uniknąć utraty danych, zwolnij miejsce lub zwiększ rozmiar dysku." + }, + "cluster-info":{ + "service-id":"ID usługi", + "service-type":"Typ usługi", + "no-data":"Brak danych" + }, + "transport-messages":{ + "title":"Wiadomości transportowe", + "info":"Wszystkie wiadomości odebrane od urządzeń" + }, + "activity":{ + "title":"Aktywność" + }, + "documentation":{ + "title":"Dokumentacja", + "add-link":"Dodaj link", + "add-link-title":"Dodaj link do dokumentacji", + "name":"Nazwa", + "name-required":"Nazwa jest wymagana.", + "link":"Link", + "link-required":"Link jest wymagany.", + "columns":"Kolumny" + }, + "quick-links":{ + "title":"Szybkie linki", + "add-link":"Dodaj link", + "add-link-title":"Dodaj szybki link", + "quick-link":"Szybki link", + "quick-link-required":"Szybki link jest wymagany.", + "no-links-matching":"Nie znaleziono linków pasujących do '{{name}}'.", + "columns":"Kolumny" + }, + "recent-dashboards":{ + "title":"Dashboardy", + "last":"Ostatnio przeglądane", + "starred":"Ulubione", + "name":"Nazwa", + "last-viewed":"Ostatnio przeglądane", + "no-last-viewed-dashboards":"Nie oglądałeś jeszcze żadnych dashboardów" + }, + "configured-features":{ + "title":"Skonfigurowane funkcje", + "info":"Status funkcji wymagających konfiguracji", + "email-feature":"Email", + "sms-feature":"SMS", + "slack-feature":"Slack", + "oauth2-feature":"OAuth 2", + "2fa-feature":"2FA", + "feature-configured":"Funkcja jest skonfigurowana.\nKliknij, aby skonfigurować", + "feature-not-configured":"Funkcja nie jest skonfigurowana.\nKliknij, aby skonfigurować" + }, + "version-info":{ + "title":"Wersja", + "contact-us":"Skontaktuj się z nami", + "current-version":"Aktualna wersja", + "current":"Aktualna", + "available-version":"Dostępna wersja", + "available":"Dostępna", + "upgrade":"Aktualizuj", + "version-is-up-to-date":"Wersja jest aktualna" + }, + "usage-info":{ + "title":"Użycie", + "entities":"Encje", + "api-calls":"Wywołania API" + }, + "functions":{ + "title":"Funkcje", + "pe-feature-tooltip":"Tylko w ThingsBoard\nProfessional Edition", + "switch-to-pe":"Przełącz do PE", + "alarms":"Alarmy", + "dashboards":"Dashboards", + "entities-and-relations":"Encje i relacje", + "profiles":"Profile", + "advanced-features":"Zaawansowane funkcje", + "notification-center":"Centrum powiadomień", + "api-usage":"Użycie API", + "customers":"Klienci", + "customers-hierarchy":"Hierarchia klientów", + "roles-and-permissions":"Role i uprawnienia", + "groups":"Grupy", + "integrations":"Integracje", + "solution-templates":"Szablony rozwiązań", + "scheduler":"Harmonogram", + "white-labeling":"White-labeling" + }, + "devices":{ + "view-docs":"Zobacz dokumentację", + "inactive":"Nieaktywne", + "active":"Aktywne", + "total":"Razem" + }, + "alarms":{ + "critical":"Krytyczne", + "assigned-to-me":"Przypisane do mnie", + "total":"Razem" + }, + "getting-started":{ + "get-started":"Rozpocznij", + "finish":"Zakończ", + "done-welcome-title":"Witamy na pokładzie", + "done-welcome-text":"Świetnie sobie poradziłeś!", + "sys-admin":{ + "step1":{ + "title":"Utwórz Najemcę i Administratora Najemcy", + "content":"

Najemca to osoba lub organizacja, która posiada lub wytwarza urządzenia i zasoby. Najemca może mieć wielu administratorów najemców, klientów, urządzeń i zasobów.

Administrator najemcy może tworzyć i zarządzać urządzeniami, zasobami, klientami i pulpitami w ramach konta najemcy.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-create-tenant":"Jak utworzyć Najemcę i Administratora Najemcy" + }, + "step2":{ + "title":"Skonfiguruj funkcję: Serwer poczty", + "content":"

Konfiguracja serwera poczty jest niezbędna do aktywacji użytkowników, odzyskiwania hasła i dostarczania powiadomień o alarmach.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-configure-mail-server":"Jak skonfigurować serwer poczty" + }, + "step3":{ + "title":"Skonfiguruj funkcję: Dostawca SMS", + "content":"

Skonfiguruj dostawców SMS, aby informować klientów o alarmach za pomocą wiadomości SMS.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-configure-sms-provider":"Jak skonfigurować dostawcę SMS" + }, + "step4":{ + "title":"Skonfiguruj funkcję: 2FA", + "content":"

Popraw bezpieczeństwo kont platformy za pomocą uwierzytelniania dwuetapowego.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-configure-2fa":"Jak skonfigurować 2FA" + }, + "step5":{ + "title":"Skonfiguruj funkcję: OAuth 2", + "content":"

Uprość logowanie dla użytkowników najemcy i klientów za pomocą funkcji jednokrotnego logowania za pośrednictwem OAuth 2.0.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-configure-oauth2":"Jak skonfigurować OAuth 2" + }, + "step6":{ + "title":"Skonfiguruj funkcję: Slack", + "content":"

Rozprowadzaj powiadomienia do użytkowników najemców i klientów za pośrednictwem Slack zgodnie z zasadami powiadomień, które ustawisz.

Przeczytaj dokumentację, aby się dowiedzieć, jak to zrobić:

", + "how-to-configure-notifications":"Jak skonfigurować Slack" + } + }, + "tenant-admin":{ + "step1":{ + "title":"Utwórz urządzenie", + "content":"

Dodaj swoje pierwsze urządzenie do platformy za pomocą interfejsu użytkownika. Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-create-device":"Jak utworzyć urządzenie" + }, + "step2":{ + "title":"Podłącz urządzenie", + "content-before":"

Aby podłączyć urządzenie, potrzebujesz danych uwierzytelniających urządzenia. Zalecamy korzystanie z domyślnie generowanych danych uwierzytelniających, czyli token dostępu, zgodnie z tym przewodnikiem.

  • Przejdź do tabeli urządzeń
  • Kliknij w wiersz urządzenia, aby otworzyć szczegóły urządzenia
  • Naciśnij przycisk „Kopiuj token dostępu”

Użyj prostych poleceń, aby publikować dane za pomocą protokołu HTTP. Nie zapomnij zamienić $ACCESS_TOKEN na swój token dostępu do urządzenia:

", + "ubuntu":{ + "install-curl":"Zainstaluj cURL dla Ubuntu:" + }, + "macos":{ + "install-curl":"Zainstaluj cURL dla MacOS:" + }, + "windows":{ + "install-curl":"Od Windows 10 b17063 cURL jest dostępny domyślnie." + }, + "replace-access-token":"Zamień $ACCESS_TOKEN na token dostępu do swojego urządzenia:", + "content-after":"

Możesz także używać innych protokołów, takich jak MQTT, CoAP, itp.

Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-connect-device":"Jak podłączyć urządzenie" + }, + "step3":{ + "title":"Utwórz pulpit", + "content":"

Utwórz pulpit, aby wizualizować dane z jednostek, takich jak zasoby, urządzenia, itp.

Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-create-dashboard":"Jak utworzyć pulpit" + }, + "step4":{ + "title":"Skonfiguruj reguły alarmowe", + "alarm-rules":"Reguły alarmowe", + "content":"

Podnieśmy alarm, gdy temperatura osiągnie 25°C. Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-configure-alarm-rules":"Jak skonfigurować reguły alarmowe" + }, + "step5":{ + "title":"Utwórz alarm", + "content-before":"

Aby uruchomić alarm, prześlij nową wartość telemetrii równej lub wyższej niż 26°C.

", + "replace-access-token":"Zamień $ACCESS_TOKEN na token dostępu do swojego urządzenia:", + "content-after":"

Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-create-alarm":"Jak utworzyć alarm" + }, + "step6":{ + "title":"Utwórz klienta i przypisz pulpit", + "content":"

Tworząc pulpity dla końcowych użytkowników, użytkownik klienta może widzieć tylko swoje urządzenia, a dane innego klienta będą ukryte.

Przeczytaj dokumentację, aby dowiedzieć się, jak to zrobić:

", + "how-to-create-customer-and-assign-dashboard":"Jak utworzyć klienta i przypisać pulpit" + } + } + } + }, + "color":{ + "color":"Kolor" + }, + "icon":{ + "icon":"Ikona", + "icons":"Ikony", + "select-icon":"Wybierz ikonę", + "material-icons":"Ikony materiałowe", + "show-all":"Pokaż wszystkie ikony", + "search-icon":"Wyszukaj ikonę", + "no-icons-found":"Nie znaleziono ikon dla '{{iconSearch}}'" + }, + "phone-input":{ + "phone-input-label":"Numer telefonu", + "phone-input-required":"Numer telefonu jest wymagany", + "phone-input-validation":"Numer telefonu jest nieprawidłowy lub niemożliwy", + "phone-input-pattern":"Nieprawidłowy numer telefonu. Powinien być w formacie E.164, np. {{phoneNumber}}", + "phone-input-hint":"Numer telefonu w formacie E.164, np. {{phoneNumber}}" + }, + "custom":{ + "widget-action":{ + "action-cell-button":"Przycisk w komórce akcji", + "row-click":"Po kliknięciu w wiersz", + "polygon-click":"Po kliknięciu w wielokąt", + "marker-click":"Po kliknięciu w marker", + "circle-click":"Po kliknięciu w okrąg", + "tooltip-tag-action":"Akcja etykiety narzędziowej", + "node-selected":"Po wybraniu węzła", + "element-click":"Po kliknięciu w element HTML", + "pie-slice-click":"Po kliknięciu w kawałek tarty", + "row-double-click":"Po podwójnym kliknięciu w wiersz", + "card-click":"Po kliknięciu w kartę" + } + }, + "paginator":{ + "items-per-page":"Elementy na stronie:", + "first-page-label":"Pierwsza strona", + "last-page-label":"Ostatnia strona", + "next-page-label":"Następna strona", + "previous-page-label":"Poprzednia strona", + "items-per-page-separator":"z" + }, + "language":{ + "language":"Język" + } +} diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json index 5891208c4c..fdc0274cdf 100644 --- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json +++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json @@ -77,7 +77,10 @@ "show-more": "显示更多", "dont-show-again": "不再显示", "see-documentation": "查看文档", - "clear": "清除" + "clear": "清除", + "upload": "上传", + "delete-anyway": "仍要删除", + "delete-selected": "删除所选" }, "aggregation": { "aggregation": "聚合", @@ -470,7 +473,12 @@ "notifications-settings": "通知设置", "slack-api-token": "Slack API令牌", "slack": "Slack", - "slack-settings": "Slack 设置" + "slack-settings": "Slack 设置", + "maximum-password-length": "密码最大长度", + "maximum-password-length-min": "密码最大长度应至少为6个字符", + "maximum-password-length-less-min": "密码最大长度应大于最小长度", + "force-reset-password-if-no-valid": "如果密码不可用则强制重置密码", + "force-reset-password-if-no-valid-hint": "启用此功能时请小心：它会要求使用不可用密码的用户通过电子邮件重置其密码。" }, "alarm": { "alarm": "告警", @@ -598,7 +606,7 @@ "filter-type-single-entity": "单个实体", "filter-type-entity-list": "实体列表", "filter-type-entity-name": "实体名称", - "filter-type-entity-type": "Entity type", + "filter-type-entity-type": "实体类型", "filter-type-state-entity": "仪表板状态实体", "filter-type-state-entity-description": "仪表板实体令牌状态参数", "filter-type-asset-type": "资产类型", @@ -1188,7 +1196,9 @@ "assign-dashboard-to-edge": "将仪表板分配给边缘", "assign-dashboard-to-edge-text": "请选择要分配给边缘的仪表板", "non-existent-dashboard-state-error": "找不到ID为 '{{ stateId }}' 的仪表板状态。", - "edit-mode": "编辑模式" + "edit-mode": "编辑模式", + "state-controller-default": "静态（已弃用）", + "duplicate-state-action": "复制状态" }, "datakey": { "settings": "设置", @@ -1202,13 +1212,13 @@ "data-generation-func": "数据生成功能", "use-data-post-processing-func": "使用数据后处理功能", "configuration": "数据键配置", - "timeseries": "Timeseries", + "timeseries": "时间序列", "attributes": "属性", "entity-field": "实体字段", "alarm": "告警字段", - "timeseries-required": "实体 Timeseries 必填。", - "timeseries-or-attributes-required": "实体 Timeseries/属性必填。", - "alarm-fields-timeseries-or-attributes-required": "告警字段或实体 Timeseries/属性必填。", + "timeseries-required": "实体时间序列必填。", + "timeseries-or-attributes-required": "实体时间序列/属性必填。", + "alarm-fields-timeseries-or-attributes-required": "告警字段或实体时间序列/属性必填。", "maximum-timeseries-or-attributes": "最多允许 { count, plural, =1 {1 个 timeseries/属性。} other {# 个 timeseries/属性。} }", "alarm-fields-required": "告警字段必填。", "function-types": "函数类型", @@ -1226,10 +1236,10 @@ "latest-key": "最新值数据键", "latest-key-functions": "最新值数据键函数", "latest-key-function": "最新值数据键函数", - "timeseries-keys": "Timeseries 数据键", - "timeseries-key": "Timeseries 数据键", - "timeseries-key-functions": "Timeseries数据键函数", - "timeseries-key-function": "Timeseries数据键函数", + "timeseries-keys": "时间序列数据键", + "timeseries-key": "时间序列数据键", + "timeseries-key-functions": "时间序列数据键函数", + "timeseries-key-function": "时间序列数据键函数", "maximum-function-types": "最多允许 { count, plural, =1 {1 个函数类型} other {# 个函数类型} }", "time-description": "当前值的时间戳；", "value-description": "当前值；", @@ -1578,9 +1588,9 @@ "mqtt-send-ack-on-validation-exception": "发布消息验证失败时发送PUBACK", "mqtt-send-ack-on-validation-exception-hint": "默认情况下平台将关闭相关消息验证失败的MQTT会话，启用后平台将发布确认而不是关闭会话。", "snmp-add-mapping": "添加SNMP映射", - "snmp-mapping-not-configured": "OID到Timeseries/遥测的映射未配置", - "snmp-timseries-or-attribute-name": "用于映射的Timeseries/属性名称", - "snmp-timseries-or-attribute-type": "用于映射的Timeseries/属性类型", + "snmp-mapping-not-configured": "OID到时间序列/遥测的映射未配置", + "snmp-timseries-or-attribute-name": "用于映射的时间序列/属性名称", + "snmp-timseries-or-attribute-type": "用于映射的时间序列/属性类型", "snmp-method-pdu-type-get-request": "GetRequest", "snmp-method-pdu-type-get-next-request": "GetNextRequest", "snmp-oid": "OID", @@ -2017,7 +2027,8 @@ "sync-process-started-successfully": "同步处理开始成功！", "missing-related-rule-chains-title": "边缘缺少关联规则链", "missing-related-rule-chains-text": "分配给边缘的规则链使用规则节点将消息转发给未分配给当前边缘的规则链。

缺少的规则链列表:
{{missingRuleChains}}", - "widget-datasource-error": "组件只支持边缘实体数据源" + "widget-datasource-error": "组件只支持边缘实体数据源", + "upgrade-instructions": "升级说明" }, "edge-event": { "type-dashboard": "仪表板", @@ -2046,7 +2057,7 @@ "action-type-post-attributes": "推送属性", "action-type-attributes-updated": "属性更新", "action-type-attributes-deleted": "属性删除", - "action-type-timeseries-updated": "时序更新", + "action-type-timeseries-updated": "时间序列更新", "action-type-credentials-updated": "认证更新", "action-type-assigned-to-customer": "分配给客户", "action-type-unassigned-from-customer": "取消分配客户", @@ -2211,7 +2222,9 @@ "type-notification-request": "通知请求", "type-notification-template": "通知模板", "type-notification-templates": "通知模板", - "list-of-notification-templates": "{ count, plural, =1 {1 个通知模板} other {# 个通知模板} }" + "list-of-notification-templates": "{ count, plural, =1 {1 个通知模板} other {# 个通知模板} }", + "type-tb-resources": "资源", + "list-of-tb-resources": "{ count, plural, =1 {1 个资源} other {# 个资源} }" }, "entity-field": { "created-time": "创建时间", @@ -2328,7 +2341,7 @@ "attributes-propagation": "属性传播", "attributes-propagation-hint": "每次保存或更新这个实体视图时，实体视图将自动从目标实体复制指定的属性。由于性能原因，目标实体属性不会在每次属性更改时传递到实体视图。您可以通过配置\"copy to view\"规则链中的规则节点，并将\"Post attributes\"和\"attributes Updated\"消息链接到新规则节点，从而启用自动传递。", "timeseries-data": "时间序列数据", - "timeseries-data-hint": "配置目标实体的 Timeseries 数据键,以便实体视图可以访问这些键。此 Timeseries 数据是只读的。", + "timeseries-data-hint": "配置目标实体的时间序列数据键,以便实体视图可以访问这些键。此时间序列数据是只读的。", "search": "查找实体视图", "selected-entity-views": "已选择 { count, plural, =1 {1 个实体视图} other {# 个实体视图} }", "make-public-entity-view-title": "确定要将实体视图 '{{entityViewName}}' 设为公开吗？", @@ -2427,8 +2440,8 @@ "attributes": "属性", "add-attribute": "添加属性", "add-map": "添加映射元素", - "timeseries": "Timeseries", - "add-timeseries": "添加 Timeseries", + "timeseries": "时间序列", + "add-timeseries": "添加时间序列", "field-required": "必填字段", "brokers": "代理服务器组", "add-broker": "添加代理服务器", @@ -2523,7 +2536,7 @@ "modbus-device-name": "设备名称", "modbus-poll-period": "轮询周期 (毫秒)", "modbus-attributes-poll-period": "轮询属性周期 (毫秒)", - "modbus-timeseries-poll-period": "Timeseries 轮询周期 (毫秒)", + "modbus-timeseries-poll-period": "时间序列数据轮询周期 (毫秒)", "modbus-poll-period-range": "轮询周期应为正值。", "modbus-tag": "标签", "modbus-function": "函数", @@ -2613,7 +2626,7 @@ "key-type": { "key-type": "键类型", "attribute": "属性", - "timeseries": "Timeseries", + "timeseries": "时间序列", "entity-field": "实体", "constant": "常量", "client-attribute": "客户端属性", @@ -2908,7 +2921,13 @@ "grpc-max-pings-without-data": "在没有接收到任何数据之前，服务器可以发送的keepalive ping消息的最大数量，然后将连接视为死亡", "grpc-min-ping-interval-without-data": "在没有发送或接收数据时，服务器在发送keepalive ping消息之间应等待的最小时间量", "permit-without-calls": "允许服务器在没有活动RPC调用时保持GRPC连接活动" - } + }, + "docker-label": "使用以下指令在 Docker compose 中运行 IoT 网关，并为选定的设备提供凭据", + "install-docker-compose": "使用以下说明下载、安装和设置 Docker Compose", + "download-configuration-file": "下载配置文件", + "download-docker-compose": "下载您的网关的 docker-compose.yml 文件", + "launch-gateway": "启动网关", + "launch-docker-compose": "在包含 docker-compose.yml 文件的文件夹中，使用以下命令在终端中启动网关" }, "grid": { "delete-item-title": "确定要删除此项吗？", @@ -2939,6 +2958,59 @@ "browse-file": "浏览文件", "browse-files": "浏览文件" }, + "image": { + "gallery": "图像库", + "search": "搜索图像", + "selected-images": "已选择 { count, plural, =1 {1 个图像} other {# 个图像} }", + "created-time": "创建时间", + "name": "名称", + "name-required": "名称不能为空。", + "resolution": "分辨率", + "size": "大小", + "system": "系统", + "download-image": "下载图像", + "export-image": "导出图像为JSON", + "import-image": "从JSON导入图像", + "upload-image": "上传图像", + "edit-image": "编辑图像", + "image-details": "图像详情", + "no-images": "未找到图像", + "delete-image": "删除图像", + "delete-image-title": "确定要删除图像 '{{imageTitle}}' 吗？", + "delete-image-text": "请注意，确认后图像将无法恢复。", + "delete-images-title": "确定要删除 { count, plural, =1 {1 个图像} other {# 个图像} } 吗？", + "delete-images-text": "请注意，确认后所有选定的图像都将被删除，并且所有相关数据将无法恢复。", + "list-mode": "列表视图", + "grid-mode": "网格视图", + "image-preview": "图像预览", + "update-image": "更新图像", + "export-failed-error": "无法导出图像：{{error}}", + "image-json-file": "图像JSON文件", + "invalid-image-json-file-error": "无法从JSON导入图像：无效的图像JSON数据结构。", + "image-is-in-use": "图像被其他实体使用", + "images-are-in-use": "图像被其他实体使用", + "image-is-in-use-text": "无法删除图像'{{title}}'，因为它被以下实体使用：", + "images-are-in-use-text": "由于图像被其他实体使用，无法删除所有图像。
您可以通过单击相应图像行上的引用按钮查看引用的实体。
如果仍然要删除这些图像，请在下方的表格中选择它们，然后点击删除所选按钮。", + "delete-image-in-use-text": "如果仍然要删除该图像，请点击无论如何删除按钮。", + "system-entities": "系统实体：", + "entities": "实体：", + "references": "引用", + "include-system-images": "包含系统图像", + "clear-image": "清除图像", + "no-image": "无图像", + "no-image-selected": "未选择图像", + "browse-from-gallery": "从图像库浏览", + "set-link": "设置链接", + "image-link": "图像链接", + "link": "链接", + "copy-image-link": "复制图像链接", + "embed-image": "嵌入图像", + "embed-to-html": "嵌入到HTML", + "embed-to-html-hint": "此功能将使链接对任何未经授权的用户可用。", + "embed-to-html-text": "使用以下代码片段，您可以将图像嵌入到基于纯HTML的组件中。
此类组件包括HTML卡片小部件、单元格内容函数等。", + "embed-to-angular-template": "嵌入到Angular HTML模板", + "embed-to-angular-template-text": "使用以下代码片段，您可以将图像嵌入到Angular HTML模板中。
此类组件包括Markdown小部件、小部件编辑器中的HTML部分、自定义操作等。" + }, "image-input": { "drop-images-or": "拖放一张或多张图片", "drag-and-drop": "拖放", @@ -2972,7 +3044,7 @@ "client-attribute": "客户端属性", "shared-attribute": "共享属性", "server-attribute": "服务器属性", - "timeseries": "Timeseries", + "timeseries": "时间序列", "entity-field": "实体字段", "access-token": "访问令牌", "x509": "X.509", @@ -3192,8 +3264,8 @@ "email-preview": "Email 通知预览", "slack": "Slack", "slack-preview": "Slack 通知预览", - "microsoft-teams" : "Microsoft Teams", - "microsoft-teams-preview" : "Microsoft Teams 通知预览", + "microsoft-teams": "Microsoft Teams", + "microsoft-teams-preview": "Microsoft Teams 通知预览", "sms": "SMS", "sms-preview": "SMS 通知预览", "web": "Web", @@ -3459,7 +3531,8 @@ "version-tag": "版本标签", "version-tag-hint": "自定义标签应与您设备报告的软件包版本相匹配。", "version-max-length": "版本长度应该少于256个字符", - "warning-after-save-no-edit": "上传包后，您将无法修改标题、版本、设备配置和包类型。" + "warning-after-save-no-edit": "上传包后，您将无法修改标题、版本、设备配置和包类型。", + "package-file": "包文件" }, "position": { "top": "顶部", @@ -3557,7 +3630,8 @@ "password-requirements": "密码要求", "password-should-difference": "新密码应与当前密码不同", "special-character": "{ count, plural, =1 {1 位特殊字符} other {# 位特殊字符} }", - "uppercase-letter": "{ count, plural, =1 {1 位大写字母} other {# 位大写字母} }" + "uppercase-letter": "{ count, plural, =1 {1 位大写字母} other {# 位大写字母} }", + "at-most": "最多：" } }, "relation": { @@ -3640,7 +3714,9 @@ "js-module": "JS 模块", "lwm2m-model": "LWM2M 模型", "pkcs-12": "PKCS #12" - } + }, + "resource-file": "资源文件", + "resource-files": "资源文件" }, "rulechain": { "rulechain": "规则链", @@ -4104,7 +4180,10 @@ "transport-device-telemetry-msg": "传输设备遥测消息", "transport-device-telemetry-data-points": "传输设备遥测数据点", "sec": "秒" - } + }, + "maximum-resource-size": "最大资源文件大小（字节）", + "maximum-resource-size-required": "最大资源文件大小是必需的", + "maximum-resource-size-range": "最大资源文件大小不能为负数" }, "timeinterval": { "seconds-interval": "{ seconds, plural, =1 {1 秒} other {# 秒} }", @@ -4205,409 +4284,6 @@ "background-color": "背景颜色", "background-blur": "背景模糊" }, - "unit": { - "millimeter": "mm", - "centimeter": "cm", - "angstrom": "Å", - "nanometer": "nm", - "micrometer": "μm", - "meter": "m", - "kilometer": "km", - "inch": "in", - "foot": "ft", - "yard": "yd", - "mile": "mi", - "nautical-mile": "nmi", - "astronomical-unit": "au", - "reciprocal-metre": "m⁻¹", - "meter-per-meter": "m/m", - "steradian": "sr", - "thou": "th", - "barleycorn": "bc", - "hand": "hd", - "chain": "ch", - "furlong": "fur", - "league": "lea", - "fathom": "fath", - "cable": "cb", - "link": "li", - "rod": "rd", - "nanogram": "ng", - "microgram": "μg", - "milligram": "mg", - "gram": "g", - "kilogram": "kg", - "tonne": "t", - "ounce": "oz", - "pound": "lb", - "stone": "st", - "hundredweight-count": "cwt", - "short-tons": "s.t.", - "dalton": "Da", - "grain": "gr", - "drachm": "dr", - "quarter": "qr", - "slug": "slug", - "carat": "ct", - "cubic-millimeter": "mm³", - "cubic-centimeter": "cm³", - "cubic-meter": "m³", - "cubic-kilometer": "km³", - "microliter": "μL", - "milliliter": "mL", - "liter": "L", - "hectoliter": "hL", - "cubic-inch": "in³", - "cubic-foot": "ft³", - "cubic-yard": "yd³", - "fluid-ounce": "fl oz", - "pint": "pt", - "quart": "qt", - "gallon": "gal", - "oil-barrels": "bbl", - "cubic-meter-per-kilogram": "m³/kg", - "gill": "gi", - "hogshead": "hhd", - "teaspoon": "tsp", - "tablespoon": "tbsp", - "cup": "cup", - "celsius": "°C", - "kelvin": "K", - "rankine": "°R", - "fahrenheit": "°F", - "percent": "%", - "meter-per-second": "m/s", - "kilometer-per-hour": "km/h", - "foot-per-second": "ft/s", - "mile-per-hour": "mph", - "knot": "kn", - "millimeters-per-minute": "mm/min", - "kilometer-per-hour-squared": "km/h²", - "foot-per-second-squared": "ft/s²", - "pascal": "Pa", - "kilopascal": "kPa", - "megapascal": "MPa", - "gigapascal": "GPa", - "millibar": "mbar", - "bar": "bar", - "kilobar": "kbar", - "newton": "N", - "newton-meter": "N·m", - "foot-pounds": "ft·lbf", - "inch-pounds": "in·lbf", - "newton-per-meter": "N/m", - "atmospheres": "atm", - "pounds-per-square-inch": "psi", - "torr": "Torr", - "inches-of-mercury": "inHg", - "pascal-per-square-meter": "Pa/m²", - "pound-per-square-inch": "psi", - "newton-per-square-meter": "N/m²", - "kilogram-force-per-square-meter": "kgf/m²", - "pascal-per-square-centimeter": "Pa/cm²", - "ton-force-per-square-inch": "tonf/in²", - "kilonewton-per-square-meter": "kN/m²", - "newton-per-square-millimeter": "N/mm²", - "microjoule": "μJ", - "millijoule": "mJ", - "joule": "J", - "kilojoule": "kJ", - "megajoule": "MJ", - "gigajoule": "GJ", - "watt-hour": "Wh", - "kilowatt-hour": "kWh", - "electron-volts": "eV", - "joules-per-coulomb": "J/C", - "british-thermal-unit": "BTU", - "foot-pound": "ft·lb", - "calorie": "cal", - "small-calorie": "cal", - "kilocalorie": "kcal", - "joule-per-kelvin": "J/K", - "joule-per-kilogram-kelvin": "J/(kg·K)", - "joule-per-kilogram": "J/kg", - "watt-per-meter-kelvin": "W/(m·K)", - "joule-per-cubic-meter": "J/m³", - "therm": "thm", - "electric-dipole-moment": "Debye", - "magnetic-dipole-moment": "Am²", - "debye": "D", - "coulomb-per-square-meter-per-volt": "C/(m²·V)", - "milliwatt": "mW", - "microwatt": "μW", - "watt": "W", - "kilowatt": "kW", - "megawatt": "MW", - "gigawatt": "GW", - "metric-horsepower": "PS", - "milliwatt-per-square-centimeter": "mW/cm²", - "watt-per-square-centimeter": "W/cm²", - "kilowatt-per-square-centimeter": "kW/cm²", - "milliwatt-per-square-meter": "mW/m²", - "watt-per-square-meter": "W/m²", - "kilowatt-per-square-meter": "kW/m²", - "watt-per-square-inch": "W/in²", - "kilowatt-per-square-inch": "kW/in²", - "horsepower": "hp", - "btu-per-hour": "BTU/h", - "coulomb": "C", - "millicoulomb": "mC", - "microcoulomb": "μC", - "picocoulomb": "pC", - "coulomb-per-meter": "C/m", - "coulomb-per-cubic-meter": "C/m³", - "coulomb-per-square-meter": "C/m²", - "square-millimeter": "mm²", - "square-centimeter": "cm²", - "square-meter": "m²", - "hectare": "ha", - "square-kilometer": "km²", - "square-inch": "in²", - "square-foot": "ft²", - "square-yard": "yd²", - "acre": "ac", - "square-mile": "mi²", - "are": "a", - "barn": "b", - "circular-inch": "c in²", - "milliampere-hour": "mAh", - "ampere-hours": "Ah", - "kiloampere-hours": "kAh", - "nanoampere": "nA", - "picoampere": "pA", - "microampere": "μA", - "milliampere": "mA", - "ampere": "A", - "kiloamperes": "kA", - "microampere-per-square-centimeter": "μA/cm²", - "ampere-per-square-meter": "A/m²", - "ampere-per-meter": "A/m", - "oersted": "Oe", - "bohr-magneton": "μB", - "ampere-meter-squared": "A·m²", - "ampere-meter": "A·m", - "nanovolt": "nV", - "picovolt": "pV", - "millivolts": "mV", - "microvolts": "μV", - "volt": "V", - "kilovolts": "kV", - "dbmV": "dBmV", - "dbm": "dBm", - "volt-meter": "V·m", - "kilovolt-meter": "kV·m", - "megavolt-meter": "MV·m", - "microvolt-meter": "μV·m", - "millivolt-meter": "mV·m", - "nanovolt-meter": "nV·m", - "ohm": "Ω", - "microohm": "μΩ", - "milliohm": "mΩ", - "kilohm": "kΩ", - "megohm": "MΩ", - "gigohm": "GΩ", - "hertz": "Hz", - "kilohertz": "kHz", - "megahertz": "MHz", - "gigahertz": "GHz", - "rpm": "rpm", - "candela-per-square-meter": "cd/m²", - "candela": "cd", - "lumen": "lm", - "lux": "lx", - "foot-candle": "fc", - "lumen-per-square-meter": "lm/m²", - "lux-second": "lx·s", - "lumen-second": "lm·s", - "lumens-per-watt": "lm/W", - "absorbance": "AU", - "mole": "mol", - "nanomole": "nmol", - "micromole": "μmol", - "millimole": "mmol", - "kilomole": "kmol", - "mole-per-cubic-meter": "mol/m³", - "rssi": "RSSI", - "ppm": "ppm", - "ppb": "ppb", - "micrograms-per-cubic-meter": "μg/m³", - "aqi": "AQI", - "gram-per-cubic-meter": "g/m³", - "gram-per-kilogram": "g/kg", - "millimeters-per-second": "mm/s", - "neper": "Np", - "bel": "B", - "decibel": "dB", - "meters-per-second-squared": "m/s²", - "becquerel": "Bq", - "curie": "Ci", - "gray": "Gy", - "sievert": "Sv", - "roentgen": "R", - "cps": "cps", - "rad": "rad", - "rem": "rem", - "dps": "dps", - "rutherford": "Rd", - "coulombs-per-kilogram": "C/kg", - "becquerels-per-cubic-meter": "Bq/m³", - "curies-per-liter": "Ci/L", - "becquerels-per-second": "Bq/s", - "curies-per-second": "Ci/s", - "gy-per-second": "Gy/s", - "watt-per-steradian": "W/sr", - "watt-per-square-metre-steradian": "W/(m²·sr)", - "ph-level": "pH", - "turbidity": "NTU", - "mg-per-liter": "mg/L", - "microsiemens-per-centimeter": "μS/cm", - "millisiemens-per-meter": "mS/m", - "siemens-per-meter": "S/m", - "kilogram-per-cubic-meter": "kg/m³", - "gram-per-cubic-centimeter": "g/cm³", - "kilogram-per-square-meter": "kg/m²", - "milligram-per-milliliter": "mg/mL", - "pound-per-cubic-foot": "lb/ft³", - "ounces-per-cubic-inch": "oz/in³", - "tons-per-cubic-yard": "ton/yd³", - "particle-density": "PD", - "kilometers-per-liter": "km/L", - "miles-per-gallon": "mpg", - "liters-per-100-km": "L/100 km", - "gallons-per-mile": "gal/mi", - "liters-per-hour": "L/h", - "gallons-per-hour": "gal/h", - "beats-per-minute": "bpm", - "millimeters-of-mercury": "mmHg", - "milligrams-per-deciliter": "mg/dL", - "g-force": "G", - "kilonewton": "kN", - "kilogram-force": "kgf", - "pound-force": "lbf", - "kilopound-force": "kip", - "dyne": "dyn", - "poundal": "pdl", - "kip": "kip", - "gal": "Gal", - "gravity": "g₀", - "hectopascal": "hPa", - "atmosphere": "atm", - "millibars": "mbar", - "inch-of-mercury": "inHg", - "richter-scale": "Richter", - "second": "s", - "minute": "min", - "hour": "hr", - "day": "day", - "week": "wk", - "month": "mo", - "year": "yr", - "cubic-foot-per-minute": "ft³/min", - "cubic-meters-per-hour": "m³/h", - "cubic-meters-per-second": "m³/s", - "liter-per-second": "L/s", - "liter-per-minute": "L/min", - "gallons-per-minute": "GPM", - "cubic-foot-per-second": "ft³/s", - "milliliters-per-minute": "mL/min", - "bit": "bit", - "byte": "B", - "kilobyte": "KB", - "megabyte": "MB", - "gigabyte": "GB", - "terabyte": "TB", - "petabyte": "PB", - "exabyte": "EB", - "zettabyte": "ZB", - "yottabyte": "YB", - "bit-per-second": "bps", - "kilobit-per-second": "Kbps", - "megabit-per-second": "Mbps", - "gigabit-per-second": "Gbps", - "terabit-per-second": "Tbps", - "byte-per-second": "B/s", - "kilobyte-per-second": "KB/s", - "megabyte-per-second": "MB/s", - "gigabyte-per-second": "GB/s", - "degree": "°", - "radian": "rad", - "gradian": "grad", - "mil": "mil", - "revolution": "rev", - "siemens": "S", - "millisiemens": "mS", - "microsiemens": "μS", - "kilosiemens": "kS", - "megasiemens": "MS", - "gigasiemens": "GS", - "farad": "F", - "millifarad": "mF", - "microfarad": "μF", - "nanofarad": "nF", - "picofarad": "pF", - "kilofarad": "kF", - "megafarad": "MF", - "gigafarad": "GF", - "terfarad": "TF", - "farad-per-meter": "F/m", - "tesla": "T", - "gauss": "G", - "kilogauss": "kG", - "millitesla": "mT", - "microtesla": "μT", - "nanotesla": "nT", - "kilotesla": "kT", - "megatesla": "MT", - "millitesla-square-meters": "mT·m²", - "gamma": "γ", - "lambda": "λ", - "square-meter-per-second": "m²/s", - "square-centimeter-per-second": "cm²/s", - "stoke": "St", - "centistokes": "cSt", - "square-foot-per-second": "ft²/s", - "square-inch-per-second": "in²/s", - "pascal-second": "Pa·s", - "centipoise": "cP", - "poise": "P", - "reynolds": "Re", - "pound-per-foot-hour": "lb/(ft·hr)", - "newton-second-per-square-meter": "N·s/m²", - "dyne-second-per-square-centimeter": "dyn·s/cm²", - "kilogram-per-meter-second": "kg/(m·s)", - "tesla-square-meters": "T·m²", - "maxwell": "Mx", - "tesla-per-meter": "T/m", - "gauss-per-centimeter": "G/cm", - "weber": "Wb", - "microweber": "μWb", - "milliweber": "mWb", - "gauss-square-centimeter": "G·cm²", - "kilogauss-square-centimeter": "kG·cm²", - "henry": "H", - "millihenry": "mH", - "microhenry": "μH", - "nanohenry": "nH", - "henry-per-meter": "H/m", - "tesla-meter-per-ampere": "T·m/A", - "gauss-per-oersted": "G/Oe", - "kilogram-per-mole": "kg/mol", - "gram-per-mole": "g/mol", - "milligram-per-mole": "mg/mol", - "joule-per-mole": "J/mol", - "joule-per-mole-kelvin": "J/mol-K", - "millivolts-per-meter": "mV/m", - "volts-per-meter": "V/m", - "kilovolts-per-meter": "kV/m", - "radian-per-second": "rad/s", - "radian-per-second-squared": "rad/s^2", - "revolutions-per-minute-per-second": "rpm/s", - "revolutions-per-minute-per-second-squared": "rpm/s^2", - "deg-per-second": "deg/s", - "degrees-brix": "°Bx", - "katal": "kat", - "katal-per-cubic-metre": "kat/m^3" - }, "user": { "user": "用户", "users": "用户", @@ -4765,15 +4441,15 @@ "no-widgets-text": "未找到部件", "management": "管理部件", "editor": "部件编辑器", - "confirm-to-exit-editor-html": "You have unsaved widget settings.
Are you sure you want to leave this page?", + "confirm-to-exit-editor-html": "有未保存的部件设置。
确定要离开此页面吗？", "widget-type-not-found": "加载部件配置出错。
可能关联的部件已经删除了。", "widget-type-load-error": "由于以下错误未加载部件：", "remove": "删除部件", - "delete": "Delete widget", + "delete": "删除部件", "edit": "编辑部件", "remove-widget-title": "确定要删除 '{{widgetTitle}}'部件吗？", "remove-widget-text": "确认后，控件和所有相关数据将变得不可恢复。", - "timeseries": "Timeseries", + "timeseries": "时间序列", "search-data": "查找数据", "no-data-found": "未找到数据", "latest": "最新值", @@ -5148,12 +4824,12 @@ "axis-position-top": "顶部 (默认)", "axis-position-bottom": "底部", "custom-legend-settings": "自定义图例设置", - "enable-custom-legend": "启用自定义图例 (这将允许您在键标签中使用属性/Timeseries值)", + "enable-custom-legend": "启用自定义图例 (这将允许您在键标签中使用属性/时间序列值)", "key-name": "键名", "key-name-required": "键名是必需的", "key-type": "键类型", "key-type-attribute": "属性", - "key-type-timeseries": "Timeseries", + "key-type-timeseries": "时间序列", "label-keys-list": "要在标签中使用的键列表", "no-label-keys": "未配置键", "add-label-key": "添加新键", @@ -5552,7 +5228,7 @@ "discard-changes": "放弃更改", "entity-attribute-required": "实体属性必填", "entity-coordinate-required": "纬度和经度两个字段都是必需的", - "entity-timeseries-required": "实体 Timeseries 必填", + "entity-timeseries-required": "实体时间序列必填", "get-location": "获取当前位置", "invalid-date": "无效日期", "latitude": "纬度", @@ -5570,19 +5246,19 @@ "enable-https-use-widget": "请启用HTTPS以使用此部件", "no-found-your-camera": "未找到摄像机", "no-permission-camera": "权限被用户拒绝/此站点无权使用摄像机", - "no-timeseries-selected": "未选择 Timeseries", + "no-timeseries-selected": "未选择时间序列值", "secret-key": "密钥", "secret-key-required": "密钥必填", "switch-attribute-value": "切换实体属性值", "switch-camera": "切换摄像机", - "switch-timeseries-value": "切换实体 Timeseries 值", + "switch-timeseries-value": "切换实体时间序列值", "take-photo": "拍照", "time": "时间", - "timeseries-not-allowed": "Timeseries 参数不能用于此部件", + "timeseries-not-allowed": "时间序列参数不能用于此部件", "update-failed": "更新失败", "update-successful": "更新成功", "update-attribute": "更新属性", - "update-timeseries": "更新 Timeseries", + "update-timeseries": "更新时间序列", "value": "数值", "general-settings": "通用设置", "widget-title": "部件标题", @@ -5638,7 +5314,7 @@ "attribute-settings": "属性设置", "widget-mode": "部件模式", "widget-mode-update-attribute": "更新属性", - "widget-mode-update-timeseries": "更新 Timeseries", + "widget-mode-update-timeseries": "更新时间序列", "attribute-scope": "属性范围", "attribute-scope-server": "服务器属性", "attribute-scope-shared": "共享属性", @@ -5669,7 +5345,7 @@ "datakey-type": "数据键类型", "datakey-type-server": "服务器属性（默认）", "datakey-type-shared": "共享属性", - "datakey-type-timeseries": "Timeseries", + "datakey-type-timeseries": "时间序列", "datakey-value-type": "数据键值类型", "datakey-value-type-string": "字符串", "datakey-value-type-double": "双精度", @@ -5827,7 +5503,7 @@ "retrieve-value-method-attribute": "订阅属性获取值", "retrieve-value-method-timeseries": "订阅时间序列获取值", "attribute-value-key": "属性键", - "timeseries-value-key": "Timeseries键", + "timeseries-value-key": "时间序列键", "get-value-method": "RPC获取值方法", "parse-value-function": "解析值的函数", "update-value-settings": "更新值设置", diff --git a/ui-ngx/src/assets/widget/power-button/default-layout.svg b/ui-ngx/src/assets/widget/power-button/default-layout.svg new file mode 100644 index 0000000000..74210bff64 --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/default-layout.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/power-button/default-volume-layout.svg b/ui-ngx/src/assets/widget/power-button/default-volume-layout.svg new file mode 100644 index 0000000000..9a502cc8f0 --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/default-volume-layout.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/power-button/outlined-layout.svg b/ui-ngx/src/assets/widget/power-button/outlined-layout.svg new file mode 100644 index 0000000000..9510d68721 --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/outlined-layout.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/power-button/outlined-volume-layout.svg b/ui-ngx/src/assets/widget/power-button/outlined-volume-layout.svg new file mode 100644 index 0000000000..9e511892b3 --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/outlined-volume-layout.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/power-button/simplified-layout.svg b/ui-ngx/src/assets/widget/power-button/simplified-layout.svg new file mode 100644 index 0000000000..eecb1e9cbe --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/simplified-layout.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/power-button/simplified-volume-layout.svg b/ui-ngx/src/assets/widget/power-button/simplified-volume-layout.svg new file mode 100644 index 0000000000..500d9a0c97 --- /dev/null +++ b/ui-ngx/src/assets/widget/power-button/simplified-volume-layout.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/slider/default-layout.svg b/ui-ngx/src/assets/widget/slider/default-layout.svg new file mode 100644 index 0000000000..0b6d1bce33 --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/default-layout.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/slider/extended-layout.svg b/ui-ngx/src/assets/widget/slider/extended-layout.svg new file mode 100644 index 0000000000..923ee8af3d --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/extended-layout.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/slider/simplified-layout.svg b/ui-ngx/src/assets/widget/slider/simplified-layout.svg new file mode 100644 index 0000000000..d2e3936db0 --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/simplified-layout.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss index 635d330572..ab018a8bc6 100644 --- a/ui-ngx/src/form.scss +++ b/ui-ngx/src/form.scss @@ -233,6 +233,36 @@ } } + .tb-flex { + display: flex; + flex: 1; + gap: 8px; + &.row { + flex-direction: row; + } + &.column { + flex-direction: column; + } + &.flex-start { + justify-content: flex-start; + } + &.flex-end { + justify-content: flex-end; + } + &.space-between { + justify-content: space-between; + } + &.align-center { + align-items: center; + } + &.no-gap { + gap: 0; + } + &.fill-width { + width: 100%; + } + } + .tb-form-panel, .tb-form-row { .mat-slide { margin: 0; diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss index 0750de263f..8ca9fe4e37 100644 --- a/ui-ngx/src/styles.scss +++ b/ui-ngx/src/styles.scss @@ -1252,4 +1252,8 @@ mat-icon { .cursor-pointer { cursor: pointer; } + + .no-wrap { + white-space: nowrap; + } } diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock index 2c60a7f009..d78a9a52d6 100644 --- a/ui-ngx/yarn.lock +++ b/ui-ngx/yarn.lock @@ -2747,7 +2747,14 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@svgdotjs/svg.js@^3.2.0": +"@svgdotjs/svg.filter.js@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@svgdotjs/svg.filter.js/-/svg.filter.js-3.0.8.tgz#998cb2481a871fa70d7dbaa891c886b335c562d7" + integrity sha512-YshF2YDaeRA2StyzAs5nUPrev7npQ38oWD0eTRwnsciSL2KrRPMoUw8BzjIXItb3+dccKGTX3IQOd2NFzmHkog== + dependencies: + "@svgdotjs/svg.js" "^3.1.1" + +"@svgdotjs/svg.js@^3.1.1", "@svgdotjs/svg.js@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@svgdotjs/svg.js/-/svg.js-3.2.0.tgz#6baa8cef6778a93818ac18faa2055222e60aa644" integrity sha512-Tr8p+QVP7y+QT1GBlq1Tt57IvedVH8zCPoYxdHLX0Oof3a/PqnC/tXAkVufv1JQJfsDHlH/UrjcDfgxSofqSNA==