074fe6fd37
19 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Abhinav Jha
|
9de62e0d0f
|
chore: Upgrade packages to resolve Dependabot issues (#39710)
## Description - Fix XSS issue by upgrading packages such that the `serialize-javascript` dependency resolves to `v6.0.2` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/376 - Fix XSS issue by upgrading `esbuild` to `v0.25.1` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/367 - Fix vite vulnerability by upgrading `vite` to `v6.2.1` (this is a major version upgrade and effects the `storybook` package) Fixes https://github.com/appsmithorg/appsmith/security/dependabot/364 Fixes https://github.com/appsmithorg/appsmith/security/dependabot/334 Fixes https://github.com/appsmithorg/appsmith/security/dependabot/336 - Fixes TinyMCE XSS vulnerabilities by upgrading `tinymce` to `v7.7.1` and `tinymce-react` to `v6.0.0` (Major version upgrade) Fixes https://github.com/appsmithorg/appsmith/security/dependabot/347 Fixes https://github.com/appsmithorg/appsmith/security/dependabot/348 Fixes https://github.com/appsmithorg/appsmith/security/dependabot/290 - Fix vulnerability in `webpack` by upgrading to `v5.98.0` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/324 - Fix vulnerability in `@sentry/browser` by upgrading `@sentry/react` to `v7.120.3` (Major version upgrade) _Note: [`Severity` enum has been deprecated](https://docs.sentry.io/platforms/javascript/migration/v7-to-v8/#removal-of-severity-enum)_ Fixes https://github.com/appsmithorg/appsmith/security/dependabot/345 - Fix vulnerability in `axios` by upgrading to `v1.8.3` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/391 - Fix vulnerability in `@babel/runtime` by upgrading to `v7.26.10` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/393 - Fix vulnerability in `@babel/helper` by upgrading `@babel/core` to `v7.26.10` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/392 - Fix vulnerability in `prismjs` by upgrading to `v1.30.0` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/390 - Fix vulnerability in `cookie` by upgrading to `v0.7.0` Fixes https://github.com/appsmithorg/appsmith/security/dependabot/346 ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/13967528524> > Commit: 6a36c9755e7df9e22c1c109876c127b963127a71 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=13967528524&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Thu, 20 Mar 2025 12:03:08 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit - **New Features** - Enhanced the text editor experience by introducing quick markdown-style shortcuts for headings, lists, and quotes. - **Chores** - Upgraded numerous underlying libraries and tools for improved performance and stability. - Streamlined error logging by refining how errors are categorized and reported. - Improved accessibility by updating element selectors to use `aria-label` attributes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Nilesh Sarupriya
|
bfc83b0815
|
chore: add node modules related to llamaindex (#39378)
## Description > [!TIP] > Add the llamaindex node modules, so that it can be consumed in the EE repository. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/13434643123> > Commit: 88ef34a652a6c438271ea68a6ea1c653d05cfc6a > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=13434643123&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Thu, 20 Feb 2025 13:16:09 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Chores** - Updated underlying library dependencies to support enhanced integration and stability. - **Refactor** - Streamlined default authentication behavior in the REST API datasource configuration for a more consistent setup. - Improved form field validation logic for more flexible state handling in user inputs. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> |
||
|
Shrikant Sharat Kandula
|
1c344b7433
|
chore: Remove websocket server on RTS (#37827)
Remove the websocket server on RTS. The RTS abbreviation has now completely lost significance. Let's now call it `rts`, in memory. 🙂 ## Automation /test sanity ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/12078784104> > Commit: f858c993b42c987dde43d791757f21524f5a6a40 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12078784104&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Fri, 29 Nov 2024 04:42:47 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **Bug Fixes** - Removed unnecessary socket-related dependencies and constants, streamlining the application. - **New Features** - Enhanced application performance by eliminating real-time communication features that were no longer necessary. - **Chores** - Cleaned up the codebase by removing outdated socket management files and constants, simplifying the overall architecture. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Shrikant Sharat Kandula
|
0685d335ea
|
chore: Reduce lint exceptions in ctl (#37643)
Fix linting exceptions in `ctl`.
## Automation
/test sanity
### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results -->
> [!WARNING]
> Tests have not run on the HEAD
1f2242abcfac193fb321dee8d64cb194dea0f803 yet
> <hr>Fri, 22 Nov 2024 10:06:23 UTC
<!-- end of auto-generated comment: Cypress test results -->
## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
## Release Notes
- **New Features**
- Enhanced backup and restore processes with improved user prompts and
error handling.
- Added support for optional command-line flags during database imports.
- **Bug Fixes**
- Improved error handling for various operations, including database
exports and imports.
- Enhanced logging for backup errors to provide more context.
- **Documentation**
- Updated user prompts and error messages for clarity during backup and
restore operations.
- **Tests**
- Expanded test coverage for backup functionalities and utility
functions to ensure robust error handling and output validation.
- **Chores**
- Updated dependencies to enhance TypeScript development experience.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
|
||
|
Shrikant Sharat Kandula
|
d6fbaa5372
|
chore: Port ctl code to Typescript (#37606)
This PR converts the Javscript code of the `ctl` module, into Typescript, and in the process already fixing two small bugs that went undetected because... of lack of good type checking. The linting exceptions are still there and will be removed in the next PR. Didn't want to change anymore than necessary or Git will detect these changes as "new files" instead of as "renames". ## Automation /test sanity ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/11949059369> > Commit: e156dacbc5cb513030052535c3d1f25ce1c7f222 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=11949059369&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Thu, 21 Nov 2024 08:45:48 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **New Features** - Introduced TypeScript support by updating entry points and adding type definitions for `nodemailer` and `readline-sync`. - Enhanced logging and error handling functionalities across various modules. - **Improvements** - Transitioned from CommonJS to ES module syntax for better compatibility and maintainability. - Improved clarity and structure in command handling and test files. - **Bug Fixes** - Corrected regex patterns and variable declarations in tests to enhance reliability. - **Chores** - Updated dependencies and refined module exports for better organization. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Shrikant Sharat Kandula
|
81b7727817
|
chore: Move appsmithctl to RTS (#37531)
Move the `appsmithctl` code to RTS. RTS' own build system will build `appsmithctl` as well. We're adding two command scripts, `ctl` and `appsmithctl` to `/opt/bin`, which will be the entrypoints for this. The `appsmithctl` is now just an alias to the much shorter and non-redundancy-inducing `ctl`. We aren't migrating to TypeScript in this PR so we're ignoring the new `ctl` folder in both `tsconfig.json` and `.eslintrc`. That's temporary, the next PR will fix that. ## Automation /test sanity ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/11930931528> > Commit: 90b5f97b801ac8d4b4b0126d85edff3dccc050bd > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=11930931528&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Wed, 20 Nov 2024 10:36:02 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **New Features** - Introduced the `appsmithctl` command for easier command execution. - Updated build process to include additional entry points. - **Bug Fixes** - Streamlined Docker build process, enhancing efficiency and reducing complexity. - **Documentation** - Added a new section in the README for `appsmithctl` command description. - **Chores** - Updated dependencies in `package.json`. - Removed obsolete files and workflows to simplify project structure. - **Style** - Added a new ESLint configuration for specific project needs. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Subhrashis Das
|
c70adf7440
|
chore: Switch from OTLP HTTP/protobuf (New Relic) to HTTP/JSON (Grafana) (#37404)
## Description
> [!TIP]
> _Add a TL;DR when the description is longer than 500 words or
extremely technical (helps the content, marketing, and DevRel team)._
>
> _Please also include relevant motivation and context. List any
dependencies that are required for this change. Add links to Notion,
Figma or any other documents that might be relevant to the PR._
Fixes #`Issue Number`
_or_
Fixes `Issue URL`
> [!WARNING]
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._
## Automation
/ok-to-test tags=""
### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results -->
> [!WARNING]
> Tests have not run on the HEAD
065cddccdcf3c98cb48ff201daf752708f24666c yet
> <hr>Fri, 15 Nov 2024 11:48:13 UTC
<!-- end of auto-generated comment: Cypress test results -->
## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **New Features**
- Introduced new monitoring paths for telemetry data exports:
`/monitoring/traces` and `/monitoring/metrics`.
- Added a function to streamline URL management for telemetry exports.
- **Bug Fixes**
- Updated telemetry export protocols to enhance reliability and
performance.
- **Chores**
- Updated multiple OpenTelemetry dependencies to their latest versions
for improved functionality and security.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
|
||
|
Nidhi
|
fc6ded0c5f
|
chore: Add OTLP traces to RTS (#36788) | ||
|
Valera Melnikov
|
3484a7b74c
|
fix: removing unused dependencies and explicitly installing used ones (#36573)
## Description Removing unused dependencies and explicitly installing used ones. The identification of dependencies was done using the [knip](https://knip.dev/). Dependency lists are provided in the appropriate files. - [Unused dependencies.txt](https://github.com/user-attachments/files/17161963/Unused.dependencies.txt) - [Unused devDependencies.txt](https://github.com/user-attachments/files/17161964/Unused.devDependencies.txt) - [Unlisted dependencies.txt](https://github.com/user-attachments/files/17161965/Unlisted.dependencies.txt) EE PR — https://github.com/appsmithorg/appsmith-ee/pull/5229 ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/11100669672> > Commit: 31b8da3dd07e452c8921526cd8e1336b11add27f > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=11100669672&attempt=3" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Mon, 30 Sep 2024 09:15:27 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **New Features** - Introduced new dependencies to enhance functionality and observability. - **Bug Fixes** - Removed outdated or unnecessary dependencies to streamline the application. - **Documentation** - Updated configuration files to improve clarity and maintainability. - **Chores** - Cleaned up various package files by removing unused dependencies across multiple modules. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Hetu Nandu
|
ce75cae779
|
chore: Upgrade vulnerable express dependency (#36265)
## Description Upgrade dependency as per https://github.com/appsmithorg/appsmith/pull/36250 ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ x ] No |
||
|
dependabot[bot]
|
049216787c
|
chore(deps): bump axios from 1.7.2 to 1.7.4 in /app/client (#35681)
Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/axios/axios/releases">axios's releases</a>.</em></p> <blockquote> <h2>Release v1.7.4</h2> <h2>Release notes:</h2> <h3>Bug Fixes</h3> <ul> <li><strong>sec:</strong> CVE-2024-39338 (<a href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>) (<a href="https://redirect.github.com/axios/axios/issues/6543">#6543</a>) (<a href=" |
||
|
dependabot[bot]
|
3e20868a85
|
chore: bump axios from 0.21.4 to 1.7.2 in /app/client (#35266) | ||
|
Ilia
|
1dc6944504
|
chore: upgrade Typescipt to 5.5.4 (#35314)
## Description Fixes #35296 ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10182307436> > Commit: 8b0aa1a644769cd28161b92a21f7426d0d94cf4f > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10182307436&attempt=2" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Wed, 31 Jul 2024 15:48:59 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit - **New Features** - Updated TypeScript dependency across multiple modules to support newer features and improvements. - Updated `colorjs.io` dependency in design system packages to enhance functionality. - **Bug Fixes** - Enhanced type-checking and overall code quality through dependency updates. - Refined color values in both `LightModeTheme` and `DarkModeTheme` to improve visual accuracy. - **Chores** - Improved flexibility in dependency management by allowing minor and patch updates for TypeScript and `colorjs.io`. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
Ilia
|
c7a7c3fa3f
|
chore: upgrade typescript to 5.4 (#35181)
## Description Upgrade Typescript from 4.9.5 to 5.4 Upgrading to 5.5 is not possible until we upgrade colors.js lib. It will be done in separate PR More details here https://github.com/color-js/color.js/issues/560#issuecomment-2182819685 ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10163124159> > Commit: 8d2e93f2e2913e715686ccb058d3efddd55aabc9 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10163124159&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Tue, 30 Jul 2024 14:11:42 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit - **New Features** - Updated TypeScript dependency to the latest version (5.4), enhancing overall functionality with potential new features and improvements. - **Improvements** - Enhanced type safety by refining the `isString` function, allowing better type inference and preventing runtime errors. - Improved comments and annotations in the `indirectEval` function for better clarity on its usage and intent. - Corrected typographical errors in error handling logic across multiple controllers, improving reliability in error messaging. - Updated export style for `IconNames` to clarify its purpose as a type, enhancing developer experience. - **Configuration Changes** - Updated Jest configurations to better support ECMAScript Modules (ESM), improving compatibility and allowing for more flexible module handling. - Adjusted TypeScript configuration to enhance module handling and compatibility. <!-- end of auto-generated comment: release notes by coderabbit.ai --> |
||
|
dependabot[bot]
|
7346cfda8c
|
chore: bump socket.io from 4.6.1 to 4.6.2 in /app/client (#34350)
Bumps [socket.io](https://github.com/socketio/socket.io) from 4.6.1 to 4.6.2. ## Automation /ok-to-test tags="@tag.Sanity" <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/socketio/socket.io/releases">socket.io's releases</a>.</em></p> <blockquote> <h2>4.6.2</h2> <h3>Bug Fixes</h3> <ul> <li><strong>exports:</strong> move <code>types</code> condition to the top (<a href="https://redirect.github.com/socketio/socket.io/issues/4698">#4698</a>) (<a href=" |
||
|
dependabot[bot]
|
af71de91fe
|
chore(deps): bump express from 4.18.2 to 4.19.2 in /app/client (#32070)
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> |
||
|
dependabot[bot]
|
037d2fabb0
|
chore(deps): bump axios from 0.27.2 to 1.6.0 in /app/client (#28776)
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/axios/axios/releases">axios's releases</a>.</em></p> <blockquote> <h2>Release v1.6.0</h2> <h2>Release notes:</h2> <h3>Bug Fixes</h3> <ul> <li><strong>CSRF:</strong> fixed CSRF vulnerability CVE-2023-45857 (<a href="https://redirect.github.com/axios/axios/issues/6028">#6028</a>) (<a href=" |
||
|
Shrikant Sharat Kandula
|
14f4bae198
|
chore: Use separate specific esbuild for RTS (#27764)
Use separate specifici `esbuild` for building RTS, instead of reusing the one coming from storybook. As recommended in [this comment](https://github.com/appsmithorg/appsmith/pull/27310#pullrequestreview-1652734575). |
||
|
Valera Melnikov
|
9f607d250d
|
chore: move local dependency to packages (#23395)
## Description 1. Move everything related to client from app folder to client folder (`.yarn`, `yarn.lock`, package.json, .gitignore) 2. Move `ast` and `rst` to client packages 3. Fix running scripts in packages 4. Add running unit tests in packages in CI TODO: It is necessary to consider enabling the `nmHoistingLimits: workspaces` option, since now all packages are hoisted to the root, there may be issues with dependencies in workspaces. Also, there is a possibility of implicit use of packages. https://yarnpkg.com/configuration/yarnrc#nmHoistingLimits #### PR fixes following issue(s) Fixes #23333 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [x] Manual - [x] Jest - [x] Cypress ## Checklist: #### Dev activity - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag Co-authored-by: Valera Melnikov <melnikov.vv@greendatasoft.ru> |