From cf70d38e6ce5bf2dbf9925b93a6e0b0dd0280d96 Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Sun, 26 Nov 2023 23:09:41 +0300
Subject: [PATCH 01/44] =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20openid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oidc-settings.js                           | 22 +++++++++++++++
 package.json                               |  1 +
 src/frontend/auth/oidc-client.js           | 32 ++++++++++++++++++++++
 src/frontend/components/Layouts/Header.vue | 24 +++++++++++++++-
 src/frontend/index.js                      |  2 ++
 src/frontend/router/routes.js              | 16 +++++++++++
 6 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 oidc-settings.js
 create mode 100644 src/frontend/auth/oidc-client.js

diff --git a/oidc-settings.js b/oidc-settings.js
new file mode 100644
index 00000000..c0dc1596
--- /dev/null
+++ b/oidc-settings.js
@@ -0,0 +1,22 @@
+import {Log, UserManager} from 'oidc-client-ts';
+
+Log.setLogger(console);
+Log.setLevel(Log.ERROR);
+
+const url = window.location.origin;
+
+export const settings = {
+    authority: 'http://localhost:8099/realms/dochub',
+    client_id: 'dochub',
+    redirect_uri: new URL('/login', url),
+    post_logout_redirect_uri: new URL('/logout', url),
+    response_type: 'code',
+    scope: 'openid',
+    response_mode: 'fragment',
+    automaticSilentRenew: true
+};
+
+export {
+    Log,
+    UserManager
+};
diff --git a/package.json b/package.json
index 220d8c19..462b0010 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "mermaid": "10.6.1",
     "monaco-editor": "0.34.1",
     "mustache": "4.2.0",
+    "oidc-client-ts": "2.4.0",
     "semver": "7.5.4",
     "swagger-ui": "3.52.5",
     "uuid": "8.3.2",
diff --git a/src/frontend/auth/oidc-client.js b/src/frontend/auth/oidc-client.js
new file mode 100644
index 00000000..0587abc2
--- /dev/null
+++ b/src/frontend/auth/oidc-client.js
@@ -0,0 +1,32 @@
+export default {
+    login() {
+        window.OidcUserManager.signinRedirect()
+            .then(() => {
+                // eslint-disable-next-line no-console
+                console.log('User logged in');
+            })
+            .catch(error => {
+                // eslint-disable-next-line no-console
+                console.error(error);
+            });
+    },
+    logout() {
+        window.OidcUserManager.signoutRedirect()
+            .then(() => {
+                // eslint-disable-next-line no-console
+                console.log('User logged out');
+            })
+            .catch(error => {
+                // eslint-disable-next-line no-console
+                console.error(error);
+            });
+    },
+    async signinCallback() {
+        if (window.location.hash) {
+            await window.OidcUserManager.signinCallback();
+            window.location.hash = '';
+        } else {
+            window.location = window.origin + '/main';
+        }
+    }
+};
diff --git a/src/frontend/components/Layouts/Header.vue b/src/frontend/components/Layouts/Header.vue
index 9f58f721..0d2440d7 100644
--- a/src/frontend/components/Layouts/Header.vue
+++ b/src/frontend/components/Layouts/Header.vue
@@ -14,6 +14,17 @@
     </v-app-bar-nav-icon>
     <v-toolbar-title style="cursor: pointer" v-on:click="onLogoClick">DocHub</v-toolbar-title>
     <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-spacer />
+    <v-toolbar-title right offset-y style="cursor: pointer" v-on:click="loginout()">{{ user || 'Login' }}</v-toolbar-title>
+    <v-spacer />
     <v-btn v-if="isCriticalError" icon title="Есть критические ошибки!" v-on:click="gotoProblems">
       <v-icon class="material-icons blink" style="display: inline">error</v-icon>
     </v-btn>
@@ -41,6 +52,7 @@
 
 <script>
   import env, {Plugins} from '@front/helpers/env';
+  import oidcClient from '@front/auth/oidc-client';
 
   import HeaderLogo from './HeaderLogo';
 
@@ -52,7 +64,8 @@
     data() {
       return {
         isSearchInCode: env.isPlugin(Plugins.idea),
-        isBackShow: env.isPlugin(Plugins.vscode)
+        isBackShow: env.isPlugin(Plugins.vscode),
+        user: null
       };
     },
     computed: {
@@ -69,6 +82,12 @@
         }
       }
     },
+    mounted() {
+      window.OidcUserManager.getUser().then(user => {
+        const userName = user?.profile?.name;
+        this.user = userName ? userName + ' (Logout)' : null;
+      });
+    },
     methods: {
       doPrint() {
         window.print();
@@ -114,6 +133,9 @@
             window.$PAPI.goto(null, 'document', struct[2]);
             break;
         }
+      },
+      loginout() {
+        this.user ? oidcClient.logout() : oidcClient.login();
       }
     }
   };
diff --git a/src/frontend/index.js b/src/frontend/index.js
index 8dfe6358..c6aac20c 100644
--- a/src/frontend/index.js
+++ b/src/frontend/index.js
@@ -36,10 +36,12 @@ import '@assets/styles/main.css';
 import '@front/storage/indexedDB';
 import 'swagger-ui/dist/swagger-ui.css';
 import 'vuetify/dist/vuetify.min.css';
+import {UserManager, settings as oidcSettings} from '@/oidc-settings';
 
 window.Vue = Vue;
 window.Router = router;
 window.EventBus = new Vue();
+window.OidcUserManager = new UserManager(oidcSettings);
 
 Vue.use(Vuex);
 Vue.use(Vuetify);
diff --git a/src/frontend/router/routes.js b/src/frontend/router/routes.js
index 6ab7c4a5..f74cffdd 100644
--- a/src/frontend/router/routes.js
+++ b/src/frontend/router/routes.js
@@ -14,6 +14,7 @@ import Empty from '@front/components/Controls/Empty';
 import DevTool from '@front/components/JSONata/DevTool';
 import Entity from '@front/components/Entities/Entity';
 import SSOError from '@front/components/sso/SSOError';
+import oidcClient from '@front/auth/oidc-client';
 
 const middleware = (route) => {
 	if (config.oauth !== false && !window.Vuex.state.isOAuthProcess && !window.Vuex.state.access_token) {
@@ -34,7 +35,22 @@ const middleware = (route) => {
 	return route.params;
 };
 
+const login = async function() {
+  await oidcClient.signinCallback();
+};
+
 const routes = [
+  {
+    name: 'login',
+    path: '/login',
+    component: Empty,
+    props: login
+  },
+  {
+    name: 'logout',
+    path: '/logout',
+    redirect: { name: 'main' }
+  },
   {
     name: 'main',
     path: '/main',

From e715c3c3e9eb59928f4b0a96cd28753b9f14ed06 Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Mon, 27 Nov 2023 09:43:34 +0300
Subject: [PATCH 02/44] =?UTF-8?q?jwt=20=D0=B2=20=D1=80=D0=B5=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B5=20=D0=B1=D0=B5=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  1 +
 src/backend/controllers/storage.mjs | 32 ++++++++++++++++++-----------
 src/backend/helpers/jwt.mjs         | 13 ++++++++++++
 src/frontend/auth/oidc-client.js    |  3 +++
 src/frontend/helpers/requests.js    | 17 +++++++++------
 5 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 src/backend/helpers/jwt.mjs

diff --git a/package.json b/package.json
index 462b0010..df526825 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "core-js": "3.26.1",
     "dateformat": "3.0.3",
     "jsonata": "2.0.3",
+    "jsrsasign": "10.8.6",
     "md5": "2.3.0",
     "mermaid": "10.6.1",
     "monaco-editor": "0.34.1",
diff --git a/src/backend/controllers/storage.mjs b/src/backend/controllers/storage.mjs
index a8c4b085..dfa99b58 100644
--- a/src/backend/controllers/storage.mjs
+++ b/src/backend/controllers/storage.mjs
@@ -1,5 +1,6 @@
 import logger from '../utils/logger.mjs';
 import request from '../helpers/request.mjs';
+import {getRoles} from '../helpers/jwt.mjs';
 
 const LOG_TAG = 'controller-storage';
 
@@ -7,21 +8,28 @@ export default (app) => {
     // Проксирует запрос к хранилищу
     app.get('/core/storage/:hash/*', async function(req, res) {
         const hash = req.params.hash || '$unknown$';
-        const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
-        //const url = decodeURIComponent(req.params.url);
-        const uri = url.split('?')[0];
-        const baseURL = app.storage?.md5Map[hash];
-        logger.log(`Request to storage ${req.originalUrl}`, LOG_TAG);
-        if (!baseURL || !uri) {
+        const roles = getRoles(req.headers);
+        if (roles.includes('architect')) {
+            const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
+            //const url = decodeURIComponent(req.params.url);
+            const uri = url.split('?')[0];
+            const baseURL = app.storage?.md5Map[hash];
+            logger.log(`Request to storage ${req.originalUrl}`, LOG_TAG);
+            if (!baseURL || !uri) {
+                res.status(403).json({
+                    error: 'Access denied'
+                });
+            } else {
+                request(uri, baseURL, res)
+                    .catch((e) => res.status(500).json({
+                        message: e.message,
+                        error: e
+                    }));
+            }
+        } else {
             res.status(403).json({
                 error: 'Access denied'
             });
-        } else {
-            request(uri, baseURL, res)
-                .catch((e) => res.status(500).json({
-                    message: e.message,
-                    error: e
-                }));
         }
     });
 };
diff --git a/src/backend/helpers/jwt.mjs b/src/backend/helpers/jwt.mjs
new file mode 100644
index 00000000..2711107e
--- /dev/null
+++ b/src/backend/helpers/jwt.mjs
@@ -0,0 +1,13 @@
+import { KJUR } from "jsrsasign";
+
+export function getRoles(headers) {
+    if (headers?.authorization) {
+        const jwt = headers.authorization.slice(7);
+        if(KJUR.jws.JWS.verifyJWT(jwt, process.env.VUE_APP_DOCHUB_AUTH_PUBLIC_KEY, {alg: ['RS256']})) {
+            return KJUR.jws.JWS.parse(jwt)?.payloadObj?.roles || [];
+        } else {
+            console.warn(`Verification error: jwt: ${jwt}`);
+        }
+    }
+    return [];
+}
diff --git a/src/frontend/auth/oidc-client.js b/src/frontend/auth/oidc-client.js
index 0587abc2..b5fea27b 100644
--- a/src/frontend/auth/oidc-client.js
+++ b/src/frontend/auth/oidc-client.js
@@ -28,5 +28,8 @@ export default {
         } else {
             window.location = window.origin + '/main';
         }
+    },
+    async getAccessToken() {
+      return (await window.OidcUserManager.getUser())?.access_token;
     }
 };
diff --git a/src/frontend/helpers/requests.js b/src/frontend/helpers/requests.js
index f6916445..b7d624d3 100644
--- a/src/frontend/helpers/requests.js
+++ b/src/frontend/helpers/requests.js
@@ -7,6 +7,7 @@ import { Buffer } from 'buffer';
 
 import env, { Plugins } from './env';
 import { responseCacheInterceptor, requestCacheInterceptor } from './cache';
+import oidcClient from '@front/auth/oidc-client';
 // import uriTool from '@/helpers/uri';
 
 
@@ -33,6 +34,10 @@ axios.interceptors.request.use(async(params) => {
 	if (env.cache) {
 		await requestCacheInterceptor(params);
 	}
+  if (env.backendURL() && (new URL(params.url)).host === (new URL(env.backendURL())).host) {
+    const accessToken = await oidcClient.getAccessToken();
+    params.headers.common.Authorization = 'Bearer ' + accessToken;
+  }
 	return gitlab.axiosInterceptor(params);
 }, (error) => Promise.reject(error));
 
@@ -50,8 +55,8 @@ axios.interceptors.response.use(async(response) => {
 				)
 				response.data = JSON.parse(response.data);
 			else if (
-				(url.indexOf('.yaml/raw') >= 0) 
-				|| (url.slice(-5) === '.yaml') 
+				(url.indexOf('.yaml/raw') >= 0)
+				|| (url.slice(-5) === '.yaml')
 				|| (response?.headers || {})['content-type'] === 'application/x-yaml')
 				response.data = YAML.parse(response.data);
 		}
@@ -131,7 +136,7 @@ export default {
 		if (finalURl && finalURl.startsWith('backend://')) {
 			return (new URL(finalURl.slice(10), env.backendFileStorageURL()));
 		} else {
-			return url;	
+			return url;
 		}
 	},
 
@@ -158,11 +163,11 @@ export default {
 		params.url = uri;
 		// Если ссылка ведет на backend конвертируем ее
 		let strURI = (uri || '').toString();
-	
-		// Если URI является ссылкой на ресурс в Data Lake интерпретируем ее 
+
+		// Если URI является ссылкой на ресурс в Data Lake интерпретируем ее
 		strURI.startsWith('res://') && (strURI = this.expandResourceURI(strURI));
 		baseURI && baseURI.toString().startsWith('res://') && (baseURI = this.expandResourceURI(baseURI));
-		
+
 		if (strURI.startsWith('source:')) {
 			return new Promise((success) => {
 				success({

From 754faf2671edb8b182080eeee8ec6287ae07f0fb Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Mon, 27 Nov 2023 09:43:59 +0300
Subject: [PATCH 03/44] =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8E=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/router/routes.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/frontend/router/routes.js b/src/frontend/router/routes.js
index f74cffdd..c0e2e230 100644
--- a/src/frontend/router/routes.js
+++ b/src/frontend/router/routes.js
@@ -32,6 +32,13 @@ const middleware = (route) => {
 		);
 	}
 
+    window.OidcUserManager.getUser().then(user => {
+      if (user) {
+        // eslint-disable-next-line no-console
+        console.log(user.profile.roles);
+      }
+    });
+
 	return route.params;
 };
 

From b29a2481a87b5fa67c505850fd2c7a04efcaf99f Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Mon, 27 Nov 2023 09:43:59 +0300
Subject: [PATCH 04/44] =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8E=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/router/routes.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/frontend/router/routes.js b/src/frontend/router/routes.js
index f74cffdd..c0e2e230 100644
--- a/src/frontend/router/routes.js
+++ b/src/frontend/router/routes.js
@@ -32,6 +32,13 @@ const middleware = (route) => {
 		);
 	}
 
+    window.OidcUserManager.getUser().then(user => {
+      if (user) {
+        // eslint-disable-next-line no-console
+        console.log(user.profile.roles);
+      }
+    });
+
 	return route.params;
 };
 

From 3e123411128cb21d58c7e2b651d6f5eb857f21b1 Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Mon, 27 Nov 2023 12:25:40 +0300
Subject: [PATCH 05/44] =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=8E=20=D1=8F=D0=BC=D0=BB=D1=8B=20=D0=B2=20=D0=B7=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BE=D1=82?=
 =?UTF-8?q?=20=D1=80=D0=BE=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/manifest/manager.js              | 14 +++-
 src/frontend/storage/indexedDB/cache/index.ts | 70 ++++++++++++-------
 2 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/src/frontend/manifest/manager.js b/src/frontend/manifest/manager.js
index 03844271..48ff7e7f 100644
--- a/src/frontend/manifest/manager.js
+++ b/src/frontend/manifest/manager.js
@@ -31,9 +31,19 @@ manifestParser.reloadManifest = async function(payload) {
       env.isAppendDocHubDocs
         && await manifestParser.import(manifestParser.cache.makeURIByBaseURI('/documentation/root.yaml', requests.getSourceRoot()));
 
+      let rootManifest = env.rootManifest;
+
+      const user = await window.OidcUserManager.getUser();
+      if (user && rootManifest?.endsWith('.yaml')) {
+        const role = user.profile?.roles?.filter(role => role.startsWith('dh-'))[0];
+        if (role) {
+          rootManifest = rootManifest.slice(0, -4) + role + '.yaml';
+        }
+      }
+
       // Если корневой манифест указан загружаем
-      env.rootManifest
-        && await manifestParser.import(manifestParser.cache.makeURIByBaseURI(env.rootManifest, requests.getSourceRoot()));
+      rootManifest
+        && await manifestParser.import(manifestParser.cache.makeURIByBaseURI(rootManifest, requests.getSourceRoot()));
     } else {
       /* Подключаем базовую метамодель */
       await manifestParser.import(manifestParser.cache.makeURIByBaseURI(env.uriMetamodel, requests.getSourceRoot()));
diff --git a/src/frontend/storage/indexedDB/cache/index.ts b/src/frontend/storage/indexedDB/cache/index.ts
index c5c24b0f..cce8a2c1 100644
--- a/src/frontend/storage/indexedDB/cache/index.ts
+++ b/src/frontend/storage/indexedDB/cache/index.ts
@@ -5,32 +5,50 @@ import { get, add, put } from '../core/data';
 import config from './config.json';
 import { TCacheData } from '../types/idb.types';
 
-const storeName = env.rootManifest || 'dochub';
-
-const init = (): Promise<IDBObjectStore> => create({
-  ...config,
-  storeName,
-  version: config['version']
-});
-
-const getData = (id: string): Promise<TCacheData> => get({
-  storeName,
-  dbName: config.dbName,
-  indexName: config.indexes[0].name,
-  value: id
-});
-
-const setData = (data: TCacheData): Promise<string | number> => add(
-  config.dbName,
-  storeName,
-  data
-);
-
-const putData = (data: TCacheData): Promise<string | number> => put(
-  config.dbName,
-  storeName,
-  data
-);
+async function storeName() {
+  const user = await window['OidcUserManager'].getUser();
+  // eslint-disable-next-line no-console
+  console.log(user?.profile?.roles);
+
+  return env.rootManifest || 'dochub';
+}
+
+const init = async function(): Promise<IDBObjectStore> {
+  const _storeName = await storeName();
+  return await create({
+    ...config,
+    storeName: _storeName,
+    version: config['version']
+  });
+};
+
+const getData = async function(id: string): Promise<TCacheData> {
+  const _storeName = await storeName();
+  return await get({
+    storeName: _storeName,
+    dbName: config.dbName,
+    indexName: config.indexes[0].name,
+    value: id
+  });
+};
+
+const setData = async function(data: TCacheData): Promise<string | number> {
+  const _storeName = await storeName();
+  return await add(
+    config.dbName,
+    _storeName,
+    data
+  );
+};
+
+const putData = async function(data: TCacheData): Promise<string | number> {
+  const _storeName = await storeName();
+  return await put(
+    config.dbName,
+    _storeName,
+    data
+  );
+};
 
 export {
   init,

From 6c5d144b5a07afc2af8c16098fe482b0d874564d Mon Sep 17 00:00:00 2001
From: Vladislav Markin <MarkinVY@yandex.ru>
Date: Tue, 28 Nov 2023 10:33:47 +0300
Subject: [PATCH 06/44] =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=20?=
 =?UTF-8?q?=D0=B0=D0=B9=D1=84=D1=80=D0=B5=D0=B9=D0=BC=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D0=BC=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins.json b/plugins.json
index 763a3940..576ece2b 100644
--- a/plugins.json
+++ b/plugins.json
@@ -2,6 +2,7 @@
     "inbuilt": [
         "plugins/html",
         "plugins/markaper",
-        "plugins/charts"
+        "plugins/charts",
+        "plugins/iframe"
     ]
 }

From 92f14c2a86db66a6f3cf70509265e719b188f767 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 2 Apr 2024 15:28:23 +0300
Subject: [PATCH 07/44] rules model + small fix

---
 oidc-settings.js                           |   2 +-
 package-lock.json                          |  56 ++++++++++
 plugins.json                               |   3 +-
 src/backend/controllers/core.mjs           |  66 +++++++-----
 src/backend/controllers/storage.mjs        |   5 +-
 src/backend/helpers/datasets.mjs           |   7 +-
 src/backend/helpers/jwt.mjs                |  23 +++--
 src/backend/main.mjs                       |  32 +++---
 src/backend/middlewares/cluster.mjs        |   2 +-
 src/backend/storage/cache.mjs              |   2 +
 src/backend/storage/manager.mjs            |  73 +++++++++++--
 src/frontend/components/Layouts/Header.vue | 115 ++++++++++++---------
 src/frontend/router/routes.js              |   1 +
 src/frontend/storage/gitlab.js             |  15 ++-
 src/global/manifest/parser.mjs             |  66 ++++++++++--
 15 files changed, 346 insertions(+), 122 deletions(-)

diff --git a/oidc-settings.js b/oidc-settings.js
index c0dc1596..0d482f92 100644
--- a/oidc-settings.js
+++ b/oidc-settings.js
@@ -6,7 +6,7 @@ Log.setLevel(Log.ERROR);
 const url = window.location.origin;
 
 export const settings = {
-    authority: 'http://localhost:8099/realms/dochub',
+    authority: 'https://auth.slsdev.ru/cfbRYTbCu86vSIbmWCQk/realms/dochub',
     client_id: 'dochub',
     redirect_uri: new URL('/login', url),
     post_logout_redirect_uri: new URL('/logout', url),
diff --git a/package-lock.json b/package-lock.json
index d0aca8e1..f0645736 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,10 +20,12 @@
         "core-js": "3.26.1",
         "dateformat": "3.0.3",
         "jsonata": "2.0.3",
+        "jsrsasign": "10.8.6",
         "md5": "2.3.0",
         "mermaid": "10.6.1",
         "monaco-editor": "0.34.1",
         "mustache": "4.2.0",
+        "oidc-client-ts": "2.4.0",
         "semver": "7.5.4",
         "swagger-ui": "3.52.5",
         "uuid": "8.3.2",
@@ -9494,6 +9496,11 @@
         "node": "*"
       }
     },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "node_modules/crypto-random-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -17664,6 +17671,14 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/jsrsasign": {
+      "version": "10.8.6",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.8.6.tgz",
+      "integrity": "sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==",
+      "funding": {
+        "url": "https://github.com/kjur/jsrsasign#donations"
+      }
+    },
     "node_modules/just-diff": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-5.2.0.tgz",
@@ -17676,6 +17691,11 @@
       "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==",
       "dev": true
     },
+    "node_modules/jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
     "node_modules/katex": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/katex/-/katex-0.6.0.tgz",
@@ -20860,6 +20880,18 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
+    "node_modules/oidc-client-ts": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.4.0.tgz",
+      "integrity": "sha512-WijhkTrlXK2VvgGoakWJiBdfIsVGz6CFzgjNNqZU1hPKV2kyeEaJgLs7RwuiSp2WhLfWBQuLvr2SxVlZnk3N1w==",
+      "dependencies": {
+        "crypto-js": "^4.2.0",
+        "jwt-decode": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
     "node_modules/omggif": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
@@ -38441,6 +38473,11 @@
       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
       "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
     },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "crypto-random-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -44655,6 +44692,11 @@
         "verror": "1.10.0"
       }
     },
+    "jsrsasign": {
+      "version": "10.8.6",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.8.6.tgz",
+      "integrity": "sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw=="
+    },
     "just-diff": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-5.2.0.tgz",
@@ -44667,6 +44709,11 @@
       "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==",
       "dev": true
     },
+    "jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
     "katex": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/katex/-/katex-0.6.0.tgz",
@@ -47099,6 +47146,15 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
+    "oidc-client-ts": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.4.0.tgz",
+      "integrity": "sha512-WijhkTrlXK2VvgGoakWJiBdfIsVGz6CFzgjNNqZU1hPKV2kyeEaJgLs7RwuiSp2WhLfWBQuLvr2SxVlZnk3N1w==",
+      "requires": {
+        "crypto-js": "^4.2.0",
+        "jwt-decode": "^3.1.2"
+      }
+    },
     "omggif": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
diff --git a/plugins.json b/plugins.json
index 576ece2b..763a3940 100644
--- a/plugins.json
+++ b/plugins.json
@@ -2,7 +2,6 @@
     "inbuilt": [
         "plugins/html",
         "plugins/markaper",
-        "plugins/charts",
-        "plugins/iframe"
+        "plugins/charts"
     ]
 }
diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 26fcc299..cd086f63 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -4,6 +4,7 @@ import cache from '../storage/cache.mjs';
 import queries from '../../global/jsonata/queries.mjs';
 import helpers from './helpers.mjs';
 import compression from '../../global/compress/compress.mjs';
+import {getRoles} from '../helpers/jwt.mjs';
 
 const compressor = compression();
 
@@ -37,6 +38,7 @@ export default (app) => {
     app.get('/core/storage/jsonata/:query', function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
+        const roles = getRoles(req.headers);
         const request = parseRequest(req);
         const query = (request.query.length === 36) && queries.QUERIES[request.query]
             ? `(${queries.makeQuery(queries.QUERIES[request.query], request.params)})`
@@ -54,8 +56,9 @@ export default (app) => {
             });
             return;
         } else {
+            app.storage = {...app.storage, manifests: null}
             const oldHash = app.storage.hash;
-            storeManager.reloadManifest()
+            storeManager.reloadManifest(app)
                 .then((storage) => storeManager.applyManifest(app, storage))
                 .then(() => cache.clearCache(oldHash))
                 .then(() => res.json({ message: 'success' }));
@@ -63,36 +66,45 @@ export default (app) => {
     });
 
     // Выполняет произвольные запросы 
-    app.get('/core/storage/release-data-profile/:query', function(req, res) {
+    app.get('/core/storage/release-data-profile/:query', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
-        const request = parseRequest(req);
-        cache.pullFromCache(app.storage.hash, JSON.stringify({ path: request.query, params: request.params }), async() => {
-            if (request.query.startsWith('/'))
-                return await datasets(app).releaseData(request.query, request.params);
-            else {
-                let profile = null;
-                const params = request.params;
-                if (request.query.startsWith('{'))
-                    profile = JSON.parse(request.query);
-                else
-                    profile = JSON.parse(await compressor.decodeBase64(request.query));
-
-                const ds = datasets(app);
-                if (profile.$base) {
-                    const path = ds.pathResolver(profile.$base);
-                    if (!path) {
-                        res.status(400).json({
-                            error: `Error $base location [${profile.$base}]`
-                        });
-                        return;
+        const roles = getRoles(req.headers);
+
+            console.log('apppp', app);
+            app.storage = {...app.storage, roles: [...roles]};
+            console.log('apppp', app);
+            const request = parseRequest(req);
+            cache.pullFromCache(app.storage.hash, JSON.stringify({
+                path: request.query,
+                params: request.params,
+                roles: roles
+            }), async () => {
+                if (request.query.startsWith('/'))
+                    return await datasets(app).releaseData(request.query, request.params);
+                else {
+                    let profile = null;
+                    const params = request.params;
+                    if (request.query.startsWith('{'))
+                        profile = JSON.parse(request.query);
+                    else
+                        profile = JSON.parse(await compressor.decodeBase64(request.query));
+
+                    const ds = datasets(app);
+                    if (profile.$base) {
+                        const path = ds.pathResolver(profile.$base);
+                        if (!path) {
+                            res.status(400).json({
+                                error: `Error $base location [${profile.$base}]`
+                            });
+                            return;
+                        }
+                        return await ds.getData(path.context, profile, params, path.baseURI);
+                    } else {
+                        return await ds.getData(app.storage.manifest, profile, params);
                     }
-                    return await ds.getData(path.context, profile, params, path.baseURI);
-                } else {
-                    return await ds.getData(app.storage.manifest, profile, params);
                 }
-            } 
-        }, res);
+            }, res);
     });
 
     // Возвращает результат работы валидаторов
diff --git a/src/backend/controllers/storage.mjs b/src/backend/controllers/storage.mjs
index dfa99b58..317b447d 100644
--- a/src/backend/controllers/storage.mjs
+++ b/src/backend/controllers/storage.mjs
@@ -9,7 +9,10 @@ export default (app) => {
     app.get('/core/storage/:hash/*', async function(req, res) {
         const hash = req.params.hash || '$unknown$';
         const roles = getRoles(req.headers);
-        if (roles.includes('architect')) {
+        console.log('roles', roles);
+
+        if (Array.isArray(roles) && roles.length) {
+            app.storage = {...app.storage, roles: [...roles]};
             const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
             //const url = decodeURIComponent(req.params.url);
             const uri = url.split('?')[0];
diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index c0491ac9..9833185c 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -2,16 +2,19 @@ import request from './request.mjs';
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import datasetDriver from '../../global/datasets/driver.mjs';
 import pathTool from '../../global/manifest/tools/path.mjs';
+import entities from '../entities/entities.mjs';
 import md5 from 'md5';
 
 export default function(app) {
+	let ctx = app.storage.roles.length == 0 ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roles[0]];
+	entities(ctx);
 	const result = Object.assign({}, datasetDriver,
 		{
 			// Возвращаем метаданных об объекте
 			pathResolver(path) {
 				return {
-					context: app.storage.manifest,
-					subject: pathTool.get(app.storage.manifest, path),
+					context: ctx,
+					subject: pathTool.get(ctx, path),
 					baseURI: app.storage.md5Map[md5(path)]
 				};
 			},
diff --git a/src/backend/helpers/jwt.mjs b/src/backend/helpers/jwt.mjs
index 2711107e..3d362283 100644
--- a/src/backend/helpers/jwt.mjs
+++ b/src/backend/helpers/jwt.mjs
@@ -1,12 +1,23 @@
 import { KJUR } from "jsrsasign";
 
 export function getRoles(headers) {
-    if (headers?.authorization) {
-        const jwt = headers.authorization.slice(7);
-        if(KJUR.jws.JWS.verifyJWT(jwt, process.env.VUE_APP_DOCHUB_AUTH_PUBLIC_KEY, {alg: ['RS256']})) {
-            return KJUR.jws.JWS.parse(jwt)?.payloadObj?.roles || [];
-        } else {
-            console.warn(`Verification error: jwt: ${jwt}`);
+    console.log('headers', headers);
+    const jwt = headers?.authorization.slice(7);
+
+    if (!jwt || typeof jwt === "string" && !jwt.includes('undefined')) {
+        try {
+            console.log('headers.authorization', jwt);
+            console.log('KJUR.jws.JWS.parse(jwt)',KJUR.jws.JWS.parse(jwt));
+            if(KJUR.jws.JWS.verifyJWT(jwt, process.env.VUE_APP_DOCHUB_AUTH_PUBLIC_KEY, {alg: ['RS256']})) {
+                return KJUR.jws.JWS.parse(jwt)?.payloadObj?.realm_access?.roles || [];
+            } else {
+                console.warn(`Verification error: jwt: ${jwt}`);
+            }
+        } catch (e) {
+            console.error('Error getting user groups!');
+            // eslint-disable-next-line no-console
+            console.error(e);
+            return [];
         }
     }
     return [];
diff --git a/src/backend/main.mjs b/src/backend/main.mjs
index e04f303b..1853478e 100644
--- a/src/backend/main.mjs
+++ b/src/backend/main.mjs
@@ -29,27 +29,27 @@ const mainLoop = async function() {
         logger.log(`DocHub server running on ${serverPort}`, LOG_TAG);
     });
 
-    storeManager.reloadManifest()
-        .then(async(storage) => {
-            await storeManager.applyManifest(app, storage);
-            // Подключаем драйвер кластера
-            await middlewareCluster(app, storeManager);
+     storeManager.reloadManifest(app)
+         .then(async(storage) => {
+             await storeManager.applyManifest(app, storage);
+             // Подключаем драйвер кластера
+             await middlewareCluster(app, storeManager);
 
-            // Подключаем сжатие контента
-            middlewareCompression(app);
+             // Подключаем сжатие контента
+             middlewareCompression(app);
 
-            // API ядра
-            controllerCore(app);
+             // API ядра
+             controllerCore(app);
 
-            // API сущностей 
-            controllerEntity(app);
+             // API сущностей
+             controllerEntity(app);
 
-            // Контроллер доступа к файлам в хранилище
-            controllerStorage(app);
+             // Контроллер доступа к файлам в хранилище
+             controllerStorage(app);
 
-            // Статические ресурсы
-            controllerStatic(app);
-        });
+             // Статические ресурсы
+             controllerStatic(app);
+         });
 };
 
 mainLoop();
diff --git a/src/backend/middlewares/cluster.mjs b/src/backend/middlewares/cluster.mjs
index c00d313c..5813b7f1 100644
--- a/src/backend/middlewares/cluster.mjs
+++ b/src/backend/middlewares/cluster.mjs
@@ -30,7 +30,7 @@ export default async(app, storeManager) => {
             if (remoteHash !== app.storage?.hash) {
                 logger.log(`Cluster inconsistency detected. Current hash is [${app.storage?.hash}], remote hash is [${remoteHash}]. Reloading manifest...`, LOG_TAG);
                 storeManager.cleanStorage(app);
-                storeManager.reloadManifest()
+                storeManager.reloadManifest(app)
                 .then(async(storage) => {
                     await storeManager.applyManifest(app, storage);
                     logger.log(`Reloading complete. Current hash is [${app.storage.hash}], remote hash is [${remoteHash}].`, LOG_TAG);
diff --git a/src/backend/storage/cache.mjs b/src/backend/storage/cache.mjs
index fb897cc5..4015ac43 100644
--- a/src/backend/storage/cache.mjs
+++ b/src/backend/storage/cache.mjs
@@ -124,6 +124,8 @@ export default Object.assign(prototype, {
             }
 
             if (res) {
+                console.log('__dirname', __dirname);
+                console.log('fileName', fileName);
                 if (fileName) {
                     res.setHeader('Content-Type', 'application/json').sendFile(fileName);
                 } else res.status(200).json(result);
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 5c782856..70a0ed3d 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -4,7 +4,7 @@ import cache from './cache.mjs';
 import md5 from 'md5';
 import events from '../helpers/events.mjs';
 import validators from '../helpers/validators.mjs';
-import entities from '../entities/entities.mjs';
+//import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
 
 const LOG_TAG = 'storage-manager';
@@ -28,25 +28,74 @@ manifestParser.onReloaded = (parser) => {
 export default {
 	// Стек обработчиков события на обновление манифеста
 	onApplyManifest: [],
-	reloadManifest: async function() {
+	reloadManifest: async function(app) {
+
+		console.log('reloadManifest');
 		logger.log('Run full reload manifest', LOG_TAG);
 		// Загрузку начинаем с виртуального манифеста
 		cache.errorClear();
-		await manifestParser.clean();
-		await manifestParser.startLoad();
-		await manifestParser.import('file:///$root$');
-		await manifestParser.checkAwaitedPackages();
-		await manifestParser.checkLoaded();
-		await manifestParser.stopLoad();
+		let localStorage = {};
+		let createManifest = async function() {
+			await manifestParser.clean();
+			await manifestParser.startLoad();
+			await manifestParser.import('file:///$root$');
+			await manifestParser.checkAwaitedPackages();
+			await manifestParser.checkLoaded();
+			await manifestParser.stopLoad();
+		};
+
+		function cleanData(manifest, filters, domain) {
+			if (typeof manifest != "object") return;
+			if (!manifest) return;
+
+			for (const key in manifest) {
+				for(const filter in filters) {
+					if (!key.match(filters[filter]) && key.includes(domain)) {
+						delete manifest[key];
+					}else {
+						cleanData(manifest[key], filters, domain);
+					}
+				}
+			}
+		}
+
+		let createRoleManifest = async function () {
+			try {
+				let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+				const response = await cache.request(uri, '/');
+
+				const manifest = response && (typeof response.data === 'object'
+					? response.data
+					: JSON.parse(response.data));
+
+				const domain = manifest?.domain;
+
+					for (const key in manifest?.roles) {
+						let rawManifest = Object.assign({}, manifestParser.manifest);
+						cleanData(rawManifest, manifest?.roles[key], domain);
+						localStorage.manifests[key] = rawManifest;
+					}
+
+			} catch (e) {
+				this.registerError(e, e.uri || uri);
+			}
+		}
+
+		await createManifest();
+		localStorage.manifests = {origin: manifestParser.manifest};
+		await createRoleManifest();
+
+		console.log('manifestParser.manifest', localStorage.manifests.origin);
 
-		entities(manifestParser.manifest);
+		//entities(localStorage.manifests.origin); //TODO: уточнить!!!
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {
-			manifest: manifestParser.manifest,			// Сформированный манифест
-			hash: objectHash(manifestParser.manifest),	// HASH состояния для контроля в кластере
+			manifest: localStorage.manifests.origin,			// Сформированный манифест
+			hash: objectHash(localStorage.manifests.origin),	// HASH состояния для контроля в кластере
 			mergeMap: {},								// Карта склейки объектов
 			md5Map: {},									// Карта путей к ресурсам по md5 пути
+			manifests: {...localStorage.manifests},
 			// Ошибки, которые возникли при загрузке манифестов
 			// по умолчанию заполняем ошибками, которые возникли при загрузке
 			problems: Object.keys(cache.errors || {}).map((key) => cache.errors[key]) || []
@@ -70,9 +119,11 @@ export default {
 	},
 	applyManifest: async function(app, storage) {
 		app.storage = storage;  // Инициализируем данные хранилища
+		app.storage.roles = [];
 		validators(app);        // Выполняет валидаторы
 		Object.freeze(app.storage);
 		this.onApplyManifest.map((listener) => listener(app));
+		console.log('applyManifest');
 	},
 	cleanStorage(app) {
 		app.storage = undefined;
diff --git a/src/frontend/components/Layouts/Header.vue b/src/frontend/components/Layouts/Header.vue
index 0d2440d7..74434696 100644
--- a/src/frontend/components/Layouts/Header.vue
+++ b/src/frontend/components/Layouts/Header.vue
@@ -6,47 +6,46 @@
     dark
     v-bind:class="isPrintVersion ? 'print-version' : ''"
     style="z-index: 99">
-    <v-btn v-if="isBackShow" icon v-on:click="back">
-      <v-icon>arrow_back</v-icon>
-    </v-btn>
-    <v-app-bar-nav-icon v-on:click="() => handleDrawer()">
-      <header-logo />
-    </v-app-bar-nav-icon>
-    <v-toolbar-title style="cursor: pointer" v-on:click="onLogoClick">DocHub</v-toolbar-title>
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-spacer />
-    <v-toolbar-title right offset-y style="cursor: pointer" v-on:click="loginout()">{{ user || 'Login' }}</v-toolbar-title>
-    <v-spacer />
-    <v-btn v-if="isCriticalError" icon title="Есть критические ошибки!" v-on:click="gotoProblems">
-      <v-icon class="material-icons blink" style="display: inline">error</v-icon>
-    </v-btn>
-    <v-btn v-if="isSearchInCode" icon title="Найти в коде" v-on:click="gotoCode">
-      <v-icon class="material-icons" style="display: inline">search</v-icon>
-    </v-btn>
-    <v-menu offset-y>
-      <template #activator="{ on, attrs }">
-        <v-btn icon v-bind="attrs" v-on="on">
-          <v-icon>mdi-dots-vertical</v-icon>
+    <div class="main-layout__header">
+      <div class="main-layout__header__menu">
+        <v-btn v-if="isBackShow" icon v-on:click="back">
+          <v-icon>arrow_back</v-icon>
         </v-btn>
-      </template>
-      <v-list>
-        <v-list-item>
-          <v-checkbox v-model="isPrintVersion" />
-          <v-list-item-title>Версия для печати</v-list-item-title>
-        </v-list-item>
-        <v-list-item>
-          <v-list-item-title style="cursor: pointer;" v-on:click="doPrint">Печать</v-list-item-title>
-        </v-list-item>
-      </v-list>
-    </v-menu>
+        <v-app-bar-nav-icon v-on:click="() => handleDrawer()">
+          <header-logo/>
+        </v-app-bar-nav-icon>
+        <v-toolbar-title style="cursor: pointer" v-on:click="onLogoClick">DocHub</v-toolbar-title>
+      </div>
+      <div class="main-layout__header__menu">
+        <v-toolbar-title right offset-y style="cursor: pointer" v-on:click="loginout()">{{
+            user || 'Login'
+          }}
+        </v-toolbar-title>
+        <v-spacer/>
+        <v-btn v-if="isCriticalError" icon title="Есть критические ошибки!" v-on:click="gotoProblems">
+          <v-icon class="material-icons blink" style="display: inline">error</v-icon>
+        </v-btn>
+        <v-btn v-if="isSearchInCode" icon title="Найти в коде" v-on:click="gotoCode">
+          <v-icon class="material-icons" style="display: inline">search</v-icon>
+        </v-btn>
+        <v-menu offset-y>
+          <template #activator="{ on, attrs }">
+            <v-btn icon v-bind="attrs" v-on="on">
+              <v-icon>mdi-dots-vertical</v-icon>
+            </v-btn>
+          </template>
+          <v-list>
+            <v-list-item>
+              <v-checkbox v-model="isPrintVersion"/>
+              <v-list-item-title>Версия для печати</v-list-item-title>
+            </v-list-item>
+            <v-list-item>
+              <v-list-item-title style="cursor: pointer;" v-on:click="doPrint">Печать</v-list-item-title>
+            </v-list-item>
+          </v-list>
+        </v-menu>
+      </div>
+    </div>
   </v-app-bar>
 </template>
 
@@ -86,6 +85,11 @@
       window.OidcUserManager.getUser().then(user => {
         const userName = user?.profile?.name;
         this.user = userName ? userName + ' (Logout)' : null;
+        if (this.user) {
+          window.Vuex.dispatch('reloadRootManifest');
+        } else {
+          window.Vuex.dispatch('clean');
+        }
       });
     },
     methods: {
@@ -110,11 +114,12 @@
         const struct = window.location.hash.split('/');
         switch (struct[1]) {
           case 'entities': {
-            const entity = struct[2];
-            const url = new URL(window.location.hash.slice(1), window.location);
-            const id = url.searchParams.get('id');
-            window.$PAPI.goto(null, entity, id);
-          } break;
+                             const entity = struct[2];
+                             const url = new URL(window.location.hash.slice(1), window.location);
+                             const id = url.searchParams.get('id');
+                             window.$PAPI.goto(null, entity, id);
+                           }
+                           break;
           case 'architect': {
             switch (struct[2]) {
               case 'contexts':
@@ -135,7 +140,11 @@
         }
       },
       loginout() {
-        this.user ? oidcClient.logout() : oidcClient.login();
+        console.log("login/logout");
+        this.user ? oidcClient.logout() : oidcClient.login().then(() => {
+          window.Vuex.dispatch('setRolesFromToken');
+          console.log("call set roles from token");
+        });
       }
     }
   };
@@ -143,6 +152,18 @@
 
 <style scoped>
 
+.main-layout__header {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.main-layout__header__menu {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 header.print-version {
   position: absolute;
 }
@@ -152,9 +173,9 @@ header.print-version {
     opacity: 0.0;
   }
 }
+
 .blink {
   color: #A00 !important;
   animation: blink 1s step-start 0s infinite;
 }
-
 </style>
diff --git a/src/frontend/router/routes.js b/src/frontend/router/routes.js
index c0e2e230..02d81371 100644
--- a/src/frontend/router/routes.js
+++ b/src/frontend/router/routes.js
@@ -43,6 +43,7 @@ const middleware = (route) => {
 };
 
 const login = async function() {
+  console.log('window.Vuex',window.Vuex);
   await oidcClient.signinCallback();
 };
 
diff --git a/src/frontend/storage/gitlab.js b/src/frontend/storage/gitlab.js
index e6781a46..cba3002c 100644
--- a/src/frontend/storage/gitlab.js
+++ b/src/frontend/storage/gitlab.js
@@ -55,7 +55,8 @@ export default {
 		// Признак инциализации проекта в плагине
 		notInited: null,
 		// Признак критической проблемы
-		criticalError: null
+		criticalError: null,
+    available_roles: {} //TODO: посмотреть!!!
 	},
 
 	mutations: {
@@ -67,6 +68,7 @@ export default {
 			state.projects = {};
 			state.last_changes = {};
 			state.criticalError = null;
+      state.available_roles = {};
 		},
 		setManifest(state, value) {
 			state.manifest = value;
@@ -107,7 +109,10 @@ export default {
 		},
 		setPrintVersion(state, value) {
 			state.isPrintVersion = value;
-		}
+		},
+    setAvailableRoles(state, value) {
+      state.available_roles = value;
+    }
 	},
 
 	actions: {
@@ -296,7 +301,12 @@ export default {
 
 			gateway.appendListener('source/changed', reloadSourceAll);
 		},
+    //парсим токен с ролями
+    setRolesFromToken(context){
+      console.log('ACTION.............');
+      context.commit('setAvailableRoles', {roles : {users: ['test']}});
 
+    },
 		// Вызывается при необходимости получить access_token
 		refreshAccessToken(context, OAuthCode) {
 			const params = OAuthCode ? {
@@ -343,6 +353,7 @@ export default {
 
 		// Reload root manifest
 		async reloadRootManifest(_context, payload) {
+      console.log('reload root manifest');
 			// Если работаем в режиме backend, берем все оттуда
 			if (env.isBackendMode()) {
 				storageManager.onStartReload();
diff --git a/src/global/manifest/parser.mjs b/src/global/manifest/parser.mjs
index 2a8eb086..18a50424 100644
--- a/src/global/manifest/parser.mjs
+++ b/src/global/manifest/parser.mjs
@@ -2,6 +2,7 @@ import * as semver from 'semver';
 import cache from './services/cache.mjs';
 import prototype from './prototype.mjs';
 
+
 class PackageError extends Error {
 	constructor(uri, message) {
 		super(message);
@@ -44,7 +45,7 @@ const parser = {
 		this.manifest = {};
 	},
 	startLoad() {
-		this.loaded = {};
+	    this.loaded = {};
 		this.onStartReload && this.onStartReload(this);
 	},
 	stopLoad() {
@@ -186,7 +187,7 @@ const parser = {
 					result[id] = source[id];
 					this.pushToMergeMap(keyPath, result[id], location);
 				}
-				pathStruct.length == 1 && this.propResolver[entity] && this.propResolver[entity](result[id], location);
+				pathStruct.length === 1 && this.propResolver[entity] && this.propResolver[entity](result[id], location);
 			}
 		} else {
 			result = source;
@@ -238,9 +239,62 @@ const parser = {
 	// Разбираем сущности
 	// path - путь к перечислению сущностей (ключ -> объект)
 	async parseEntity(context, path, baseURI) {
-		for (const key in context) {
-			await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
-		}
+		//if(Array.isArray(this.filters) && !this.filters.length) {
+			for (const key in context) {
+				await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
+			}
+		//} else {
+		//	for (const key in context) {
+		//		for(const filter in this.filters) {
+		//			if(key.match(this.filters[filter])) {
+		//				console.log('---------------------------');
+		//				console.log('key',key);
+			//			console.log('value',context[key]);
+			//			console.log('---------------------------');
+			//			await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
+			//		}
+			//	}
+			//}
+		//}
+
+
+		//TODO: Смотреть сюда!!!! winodw.Vuex.state....roles
+		// let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+		//
+		// try {
+		// 	const response = this.onPullSource
+		// 		? await this.onPullSource(uri, '/', this)
+		// 		: await parser.cache.request(uri, '/');
+		//
+		// 	const manifest = response && (typeof response.data === 'object'
+		// 		? response.data
+		// 		: JSON.parse(response.data));
+		//
+		// 	let userRoles = this.app?.storage?.roles;
+		// 	console.log('userRoles', userRoles);
+		//
+		// 	let filters;
+		// 	if(Array.isArray(userRoles) && userRoles.length) {
+		// 		filters = manifest?.roles[userRoles[0]]; // формировать полный список фильтров по ролям
+		// 	} else {
+		// 		filters = manifest?.roles['default'];
+		// 	}
+		//
+		// 	for (const key in context) {
+		// 		for(const filter in filters) {
+		// 			if(key.match(filters[filter])) {
+		// 				console.log('---------------------------');
+		// 				console.log('key',key);
+		// 				console.log('value',context[key]);
+		// 				console.log('---------------------------');
+		// 				await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
+		// 			}
+		// 		}
+		// 	}
+		//
+		// } catch (e) {
+		// 	this.registerError(e, e.uri || uri);
+		// }
 	},
 
 	async parseManifest(manifest, uri) {
@@ -368,8 +422,8 @@ const parser = {
 		}
 	},
 
-	// Подключение манифеста
 	async import(uri) {
+		console.log('import.uri',uri);
 		try {
 			const response = this.onPullSource 
 				? await this.onPullSource(uri, '/', this)

From 67a800a53d8c42407f9c10ade99181208957b77d Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Wed, 3 Apr 2024 15:33:29 +0300
Subject: [PATCH 08/44] rules model + small fix

---
 src/backend/controllers/storage.mjs | 39 ++++++++++++----------------
 src/backend/helpers/datasets.mjs    |  2 +-
 src/backend/storage/manager.mjs     | 40 ++++++++++++++++++-----------
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/backend/controllers/storage.mjs b/src/backend/controllers/storage.mjs
index 317b447d..1160c1a9 100644
--- a/src/backend/controllers/storage.mjs
+++ b/src/backend/controllers/storage.mjs
@@ -7,33 +7,26 @@ const LOG_TAG = 'controller-storage';
 export default (app) => {
     // Проксирует запрос к хранилищу
     app.get('/core/storage/:hash/*', async function(req, res) {
-        const hash = req.params.hash || '$unknown$';
+
         const roles = getRoles(req.headers);
-        console.log('roles', roles);
+        app.storage = {...app.storage, roles: [...roles]};
 
-        if (Array.isArray(roles) && roles.length) {
-            app.storage = {...app.storage, roles: [...roles]};
-            const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
-            //const url = decodeURIComponent(req.params.url);
-            const uri = url.split('?')[0];
-            const baseURL = app.storage?.md5Map[hash];
-            logger.log(`Request to storage ${req.originalUrl}`, LOG_TAG);
-            if (!baseURL || !uri) {
-                res.status(403).json({
-                    error: 'Access denied'
-                });
-            } else {
-                request(uri, baseURL, res)
-                    .catch((e) => res.status(500).json({
-                        message: e.message,
-                        error: e
-                    }));
-            }
-        } else {
+        const hash = req.params.hash || '$unknown$';
+        const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
+        //const url = decodeURIComponent(req.params.url);
+        const uri = url.split('?')[0];
+        const baseURL = app.storage?.md5Map[hash];
+        logger.log(`Request to storage ${req.originalUrl}`, LOG_TAG);
+        if (!baseURL || !uri) {
             res.status(403).json({
                 error: 'Access denied'
             });
+        } else {
+            request(uri, baseURL, res)
+                .catch((e) => res.status(500).json({
+                    message: e.message,
+                    error: e
+                }));
         }
     });
-};
-
+};
\ No newline at end of file
diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index 9833185c..99d60f49 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -6,7 +6,7 @@ import entities from '../entities/entities.mjs';
 import md5 from 'md5';
 
 export default function(app) {
-	let ctx = app.storage.roles.length == 0 ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roles[0]];
+	let ctx = app.storage.roles.length === 0 ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roles[0]];
 	entities(ctx);
 	const result = Object.assign({}, datasetDriver,
 		{
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 70a0ed3d..a051345c 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -6,6 +6,8 @@ import events from '../helpers/events.mjs';
 import validators from '../helpers/validators.mjs';
 //import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
+import lodash from 'lodash';
+
 
 const LOG_TAG = 'storage-manager';
 
@@ -44,17 +46,27 @@ export default {
 			await manifestParser.stopLoad();
 		};
 
-		function cleanData(manifest, filters, domain) {
+		let matchRegex = (string, filters) => {
+
+			var len = filters.length, i = 0;
+
+			for (; i < len; i++) {
+				if (string.match(filters[i])) {
+					return true;
+				}
+			}
+			return false;
+		};
+
+		function cleanData(manifest, filters) {
 			if (typeof manifest != "object") return;
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				for(const filter in filters) {
-					if (!key.match(filters[filter]) && key.includes(domain)) {
-						delete manifest[key];
-					}else {
-						cleanData(manifest[key], filters, domain);
-					}
+				if(matchRegex(key, filters)) {
+					cleanData(manifest[key], filters);
+				} else {
+					delete manifest[key];
 				}
 			}
 		}
@@ -68,11 +80,9 @@ export default {
 					? response.data
 					: JSON.parse(response.data));
 
-				const domain = manifest?.domain;
-
 					for (const key in manifest?.roles) {
-						let rawManifest = Object.assign({}, manifestParser.manifest);
-						cleanData(rawManifest, manifest?.roles[key], domain);
+						let rawManifest = lodash.cloneDeep(localStorage.manifests.origin);
+						cleanData(rawManifest, manifest?.roles[key]);
 						localStorage.manifests[key] = rawManifest;
 					}
 
@@ -87,14 +97,14 @@ export default {
 
 		console.log('manifestParser.manifest', localStorage.manifests.origin);
 
-		//entities(localStorage.manifests.origin); //TODO: уточнить!!!
+		//entities(manifestParser.manifest); //TODO: уточнить!!!
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {
-			manifest: localStorage.manifests.origin,			// Сформированный манифест
-			hash: objectHash(localStorage.manifests.origin),	// HASH состояния для контроля в кластере
+			manifest: localStorage.manifests['default'],			// Сформированный манифест
+			hash: objectHash(localStorage.manifests['default']),	// HASH состояния для контроля в кластере
 			mergeMap: {},								// Карта склейки объектов
-			md5Map: {},									// Карта путей к ресурсам по md5 пути
+			md5Map: {}, 								// Карта путей к ресурсам по md5 пути
 			manifests: {...localStorage.manifests},
 			// Ошибки, которые возникли при загрузке манифестов
 			// по умолчанию заполняем ошибками, которые возникли при загрузке

From c863c550115522b2b5a7c763a814596f0cbe51c1 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 4 Apr 2024 11:09:32 +0300
Subject: [PATCH 09/44] small fix

---
 src/backend/storage/manager.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index a051345c..a6a85a75 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -4,7 +4,7 @@ import cache from './cache.mjs';
 import md5 from 'md5';
 import events from '../helpers/events.mjs';
 import validators from '../helpers/validators.mjs';
-//import entities from '../entities/entities.mjs';
+import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
 import lodash from 'lodash';
 
@@ -63,7 +63,7 @@ export default {
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				if(matchRegex(key, filters)) {
+				if(typeof manifest[key] != 'object' || matchRegex(key, filters)) {
 					cleanData(manifest[key], filters);
 				} else {
 					delete manifest[key];
@@ -97,7 +97,7 @@ export default {
 
 		console.log('manifestParser.manifest', localStorage.manifests.origin);
 
-		//entities(manifestParser.manifest); //TODO: уточнить!!!
+		entities(localStorage.manifests['default']); //TODO: уточнить!!!
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {

From c8c3e5a95fea0415e772e31496d3d529129b1aaf Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 4 Apr 2024 14:29:38 +0300
Subject: [PATCH 10/44] small fix

---
 src/backend/controllers/core.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index cd086f63..29a685c4 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -9,14 +9,13 @@ import {getRoles} from '../helpers/jwt.mjs';
 const compressor = compression();
 
 // const LOG_TAG = 'controller-core';
-
 export default (app) => {
 
     // Создает ответ на JSONata запрос и при необходимости кэширует ответ
-    function makeJSONataQueryResponse(res, query, params, subject) {
-        cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject }), async() => {
+    function makeJSONataQueryResponse(res, query, params, subject, roles) {
+        cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject, roles }), async() => {
             return await datasets(app).parseSource(
-                app.storage.manifest,
+                app.storage.manifests[roles],
                 query,
                 subject,
                 params
@@ -39,16 +38,19 @@ export default (app) => {
         if (!helpers.isServiceReady(app, res)) return;
 
         const roles = getRoles(req.headers);
+        app.storage = {...app.storage, roles: [...roles]};
         const request = parseRequest(req);
         const query = (request.query.length === 36) && queries.QUERIES[request.query]
             ? `(${queries.makeQuery(queries.QUERIES[request.query], request.params)})`
             : request.query;
 
-        makeJSONataQueryResponse(res, query, request.params, request.subject);
+        makeJSONataQueryResponse(res, query, request.params, request.subject, roles);
     });
 
     // Запрос на обновление манифеста
     app.put('/core/storage/reload', function(req, res) {
+        const roles = getRoles(req.headers);
+        app.storage = {...app.storage, roles: [...roles]};
         const reloadSecret = req.query.secret;
         if (reloadSecret !== process.env.VUE_APP_DOCHUB_RELOAD_SECRET) {
             res.status(403).json({
@@ -110,6 +112,8 @@ export default (app) => {
     // Возвращает результат работы валидаторов
     app.get('/core/storage/problems/', function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
+        const roles = getRoles(req.headers);
+        app.storage = {...app.storage, roles: [...roles]};
         res.json(app.storage.problems || []);
     });
 

From d9233b6f95ebe2a2a24946bc649433cdd03b3d85 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 4 Apr 2024 15:02:24 +0300
Subject: [PATCH 11/44] small fix

---
 src/backend/controllers/core.mjs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 29a685c4..6f57daba 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -49,8 +49,6 @@ export default (app) => {
 
     // Запрос на обновление манифеста
     app.put('/core/storage/reload', function(req, res) {
-        const roles = getRoles(req.headers);
-        app.storage = {...app.storage, roles: [...roles]};
         const reloadSecret = req.query.secret;
         if (reloadSecret !== process.env.VUE_APP_DOCHUB_RELOAD_SECRET) {
             res.status(403).json({

From ead19a713766e1fcf132031329edcaff9facf7df Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 4 Apr 2024 18:50:05 +0300
Subject: [PATCH 12/44] fix frontend

---
 src/frontend/components/Layouts/Header.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/frontend/components/Layouts/Header.vue b/src/frontend/components/Layouts/Header.vue
index 73b0bc6d..a7f49bf2 100644
--- a/src/frontend/components/Layouts/Header.vue
+++ b/src/frontend/components/Layouts/Header.vue
@@ -22,8 +22,6 @@
     <v-btn v-if="isBackShow" icon v-on:click="refresh">
       <v-icon>refresh</v-icon>
     </v-btn>
-
-
       </div>
       <div class="main-layout__header__menu">
         <v-toolbar-title right offset-y style="cursor: pointer" v-on:click="loginout()">{{
@@ -142,6 +140,14 @@
 
         // Запрос в ide на открытие entity c id
         window.$PAPI.goto(null, entity, id);
+      },
+      loginout() {
+        this.user ? oidcClient.logout() : oidcClient.login();
+        console.log("login/logout");
+        this.user ? oidcClient.logout() : oidcClient.login().then(() => {
+          window.Vuex.dispatch('setRolesFromToken');
+          console.log("call set roles from token");
+        });
       }
     }
   };

From 225aed6e6f4ea57a70ddea17c7e97edf601fa672 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Fri, 5 Apr 2024 10:25:00 +0300
Subject: [PATCH 13/44] small fix jsonata context

---
 src/backend/controllers/core.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 6f57daba..7d620e1b 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -14,8 +14,9 @@ export default (app) => {
     // Создает ответ на JSONata запрос и при необходимости кэширует ответ
     function makeJSONataQueryResponse(res, query, params, subject, roles) {
         cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject, roles }), async() => {
+            let ctx = roles.length === 0 ? app.storage.manifests['default'] : app.storage.manifests[roles];
             return await datasets(app).parseSource(
-                app.storage.manifests[roles],
+                ctx,
                 query,
                 subject,
                 params

From f58fd52503576b930fec2394b18ecb8e68e200c9 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 9 Apr 2024 10:35:41 +0300
Subject: [PATCH 14/44] small fix filters

---
 src/backend/storage/manager.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 26f8b92a..4413b5d7 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -78,7 +78,10 @@ export default {
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				if(typeof manifest[key] != 'object' || matchRegex(key, filters)) {
+				if(key === 'patternProperties' || key === 'headers' || key === 'schema' || key === 'functions' || key === 'grid' || typeof manifest[key] != 'object')
+					continue;
+
+				if(matchRegex(key, filters))  {
 					cleanData(manifest[key], filters);
 				} else {
 					delete manifest[key];

From 3bbaf78cacbc34a67fedbfa8dccb1fc3c1dd070a Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 9 Apr 2024 13:37:37 +0300
Subject: [PATCH 15/44] small fix filters

---
 src/backend/controllers/core.mjs | 1 -
 src/backend/helpers/jwt.mjs      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 7d620e1b..e09709ec 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -115,6 +115,5 @@ export default (app) => {
         app.storage = {...app.storage, roles: [...roles]};
         res.json(app.storage.problems || []);
     });
-
 };
 
diff --git a/src/backend/helpers/jwt.mjs b/src/backend/helpers/jwt.mjs
index 3d362283..1d5a6706 100644
--- a/src/backend/helpers/jwt.mjs
+++ b/src/backend/helpers/jwt.mjs
@@ -2,9 +2,9 @@ import { KJUR } from "jsrsasign";
 
 export function getRoles(headers) {
     console.log('headers', headers);
-    const jwt = headers?.authorization.slice(7);
+    const jwt = headers?.authorization?.slice(7);
 
-    if (!jwt || typeof jwt === "string" && !jwt.includes('undefined')) {
+    if (!!jwt && typeof jwt === "string" && !jwt.includes('undefined')) {
         try {
             console.log('headers.authorization', jwt);
             console.log('KJUR.jws.JWS.parse(jwt)',KJUR.jws.JWS.parse(jwt));

From c2ae234946254e1bab0ed57608213b72d4b5bf60 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Wed, 10 Apr 2024 12:02:33 +0300
Subject: [PATCH 16/44] small fix validators

---
 src/backend/controllers/core.mjs   | 7 ++++++-
 src/backend/helpers/validators.mjs | 6 +++++-
 src/global/rules/validators.mjs    | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index e09709ec..35264ae7 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -113,7 +113,12 @@ export default (app) => {
         if (!helpers.isServiceReady(app, res)) return;
         const roles = getRoles(req.headers);
         app.storage = {...app.storage, roles: [...roles]};
-        res.json(app.storage.problems || []);
+
+        const value = roles.length !== 0 ? roles[0] : 'default';
+        const problems = app.storage.problems.filter(e => {
+            return e.key === value;
+        });
+        res.json(problems || []);
     });
 };
 
diff --git a/src/backend/helpers/validators.mjs b/src/backend/helpers/validators.mjs
index 47cdf1fa..f868e6bf 100644
--- a/src/backend/helpers/validators.mjs
+++ b/src/backend/helpers/validators.mjs
@@ -11,6 +11,10 @@ export default function(app) {
 		app.storage.problems.push(validator);
 	};
 	logger.log('Executing validators..', LOG_TAG);
-	validators(datasets(app), app.storage.manifest, pushValidator, pushValidator);
+	for (const key in app.storage.manifests) {
+		validators(datasets(app), app.storage.manifests[key], pushValidator, pushValidator, key);
+	}
+
 	logger.log('Done.', LOG_TAG);
+
 }
diff --git a/src/global/rules/validators.mjs b/src/global/rules/validators.mjs
index 65de1c0c..3405c343 100644
--- a/src/global/rules/validators.mjs
+++ b/src/global/rules/validators.mjs
@@ -1,5 +1,5 @@
 // Выполняет валидаторы и накладывает исключения
-export default function(datasets, manifest, success, reject) {
+export default function(datasets, manifest, success, reject, key) {
 	const rules = (manifest['rules'] || {});
 	const validators = rules['validators'] || {};
 	const exceptions = rules['exceptions'] || {};
@@ -9,6 +9,7 @@ export default function(datasets, manifest, success, reject) {
 			.then((items) => {
 				success({
 					id,
+					key,
 					title: validators[id].title || id,
 					items: (items || []).map((item) => {
 						return Object.assign({
@@ -20,6 +21,7 @@ export default function(datasets, manifest, success, reject) {
 				reject(
 					{
 						id,
+						key,
 						title: validators[id].title || id,
 						error,
 						items: [

From efbda79bcb42034574786e9dc8d1fbc25f94bb17 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Wed, 10 Apr 2024 13:13:46 +0300
Subject: [PATCH 17/44] small fix rules

---
 src/backend/storage/manager.mjs      |  16 +-
 src/backend/storage/system-rules.mjs | 272 +++++++++++++++++++++++++++
 2 files changed, 286 insertions(+), 2 deletions(-)
 create mode 100644 src/backend/storage/system-rules.mjs

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 4413b5d7..febdb6f1 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -7,6 +7,7 @@ import validators from '../helpers/validators.mjs';
 import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
 import lodash from 'lodash';
+import {systemRules, exclude} from './system-rules.mjs';
 
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import jsonataFunctions from '../../global/jsonata/functions.mjs';
@@ -73,12 +74,23 @@ export default {
 			return false;
 		};
 
+		let matchExclude = (string) => {
+			var len = exclude.length, i = 0;
+
+			for (; i < len; i++) {
+				if (string === exclude[i]) {
+					return true;
+				}
+			}
+			return false;
+		}
+
 		function cleanData(manifest, filters) {
 			if (typeof manifest != "object") return;
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				if(key === 'patternProperties' || key === 'headers' || key === 'schema' || key === 'functions' || key === 'grid' || typeof manifest[key] != 'object')
+				if(matchExclude(key) || typeof manifest[key] != 'object')
 					continue;
 
 				if(matchRegex(key, filters))  {
@@ -100,7 +112,7 @@ export default {
 
 					for (const key in manifest?.roles) {
 						let rawManifest = lodash.cloneDeep(localStorage.manifests.origin);
-						cleanData(rawManifest, manifest?.roles[key]);
+						cleanData(rawManifest, systemRules.concat(manifest?.roles[key]));
 						localStorage.manifests[key] = rawManifest;
 					}
 
diff --git a/src/backend/storage/system-rules.mjs b/src/backend/storage/system-rules.mjs
new file mode 100644
index 00000000..87274557
--- /dev/null
+++ b/src/backend/storage/system-rules.mjs
@@ -0,0 +1,272 @@
+export const systemRules = [
+    '^aspects[a-zA-Z\._0-9]*$',
+    '^api\.*$',
+    '^data-objects*$',
+    '^technologies*$',
+    '^app_landscape\.*$',
+    '^as-is[a-zA-Z\._0-9]*$',
+    '^$after\.*$',
+    '^average\.*$',
+    '^required\.*$',
+    '^arch_schema[a-zA-Z\._0-9]*$',
+    '^async\.*$',
+    '^agreement\.*$',
+    '^additionalProperties\.*$',
+    '^aspect\.*$',
+    '^base_ta_params[a-zA-Z\._0-9]*$',
+    '^backup_ta_params[a-zA-Z\._0-9]*$',
+    '^blank\.*$',
+    '^backup[a-zA-Z\._0-9]*$',
+    '^$before\.*$',
+    '^ecosystem.groups.unified_elements*$',
+    '^business_object_id\.*$',
+    '^backup_ta_params[a-zA-Z\._0-9]*$',
+    '^base_ta_params[a-zA-Z\._0-9]*$',
+    '^business_objects[a-zA-Z\._0-9]*$',
+    '^business_schema[a-zA-Z\._0-9]*$',
+    '^backup_placement[a-zA-Z\._0-9]*$',
+    '^business_landscape\.*$',
+    '^change-type\.*$',
+    '^changes\.*$',
+    '^consumer\.*$',
+    '^clients.validation[a-zA-Z\._0-9]*$',
+    '^components\.*$',
+    '^component\.*$',
+    '^contexts\.*$',
+    '^context*$',
+    '^tasks*$',
+    '^comments[a-zA-Z\._0-9]*$',
+    '^config[a-zA-Z\._0-9]*$',
+    '^count\.*$',
+    '^config\.*$',
+    '^clients_by_channel\.*$',
+    '^client_channels\.*$',
+    '^capacity_management[a-zA-Z\._0-9]*$',
+    '^capacity_reservation_type[a-zA-Z\._0-9]*$',
+    '^clients[a-zA-Z\._0-9]*$',
+    '^channels[a-zA-Z\._0-9]*$',
+    '^channels_by_client\.*$',
+    '^channels_by_product\.*$',
+    '^class\.*$',
+    '^criticality\.*$',
+    '^card_plain[a-zA-Z\._0-9]*$',
+    '^card[a-zA-Z\._0-9]*$',
+    '^$constructor\.*$',
+    '^config[a-zA-Z\._0-9]*$',
+    '^contains_data_objects\.*$',
+    '^description\.*$',
+    '^data_objects_contexts\.*$',
+    '^data_objects_by_integration\.*$',
+    '^data_objects_by_business\.*$',
+    '^data_map_[a-zA-Z\._0-9]*$',
+    '^domain_registry[a-zA-Z\._0-9]*$',
+    '^data_objects[a-zA-Z\._0-9]*$',
+    '^domain[a-zA-Z\._0-9]*$',
+    '^disaster_recovery[a-zA-Z\._0-9]*$',
+    '^data_context_tobe_extended[a-zA-Z\._0-9]*$',
+    '^data_context_tobe[a-zA-Z\._0-9]*$',
+    '^data_context_asis_extended[a-zA-Z\._0-9]*$',
+    '^data_context_asis[a-zA-Z\._0-9]*$',
+    '^data_context_select[a-zA-Z\._0-9]*$',
+    '^data[a-zA-Z\._0-9]*$',
+    '^dh-component-id\.*$',
+    '^\$defs*$',
+    '^dochub[a-zA-Z\._0-9]*$',
+    '^enum*$',
+    '^process_id*$',
+    '^disaster_recovery[a-zA-Z\._0-9]*$',
+    '^domains[a-zA-Z\._0-9]*$',
+    '^domain_table\.*$',
+    '^domain_registry\.*$',
+    '^dh-context-id\.*$',
+    '^dh-doc-id*$',
+    '^client_id*$',
+    '^dh-aspect-id*$',
+    '^datasets[a-zA-Z\._0-9]*$',
+    '^docs[a-zA-Z\._0-9]*$',
+    '^dh-focus-id\.*$',
+    '^entities\.*$',
+    '^extra-links\.*$',
+    '^\$error[a-zA-Z\._0-9]*$',
+    '^ecogroup\.[a-zA-Z\._0-9]*$',
+    '^elk[a-zA-Z\._0-9]*$',
+    '^fetchLinks\.*$',
+    '^function_id\.*$',
+    '^functions[a-zA-Z\._0-9]*$',
+    '^function_map_[a-zA-Z\._0-9]*$',
+    '^goals\.*$',
+    '^group_context_tobe_exclude_details[a-zA-Z\._0-9]*$',
+    '^group_context_tobe[a-zA-Z\._0-9]*$',
+    '^group_context_asis_exclude_details[a-zA-Z\._0-9]*$',
+    '^group_context_asis[a-zA-Z\._0-9]*$',
+    '^group_schema[a-zA-Z\._0-9]*$',
+    '^groups[a-zA-Z\._0-9]*$',
+    '^global[a-zA-Z\._0-9]*$',
+    '^group_contexts\.*$',
+    '^goal_id\.*$',
+    '^goals[a-zA-Z\._0-9]*$',
+    '^hierarchy\.*$',
+    '^horizont\.*$',
+    '^hadr_params[a-zA-Z\._0-9]*$',
+    '^high_availability[a-zA-Z\._0-9]*$',
+    '^hooks[a-zA-Z\._0-9]*$',
+    '^header[a-zA-Z\._0-9]*$',
+    '^high_availability[a-zA-Z\._0-9]*$',
+    '^helpers[a-zA-Z\._0-9]*$',
+    '^high_availability[a-zA-Z\._0-9]*$',
+    '^headers\.*$',
+    '^imports\.*$',
+    '^integrations[a-zA-Z\._0-9]*$',
+    '^integrity[a-zA-Z\._0-9]*$',
+    '^icon\.*$',
+    '^in_systems\.*$',
+    '^integration_id\.*$',
+    '^id[a-zA-Z\._0-9]*$',
+    '^items[a-zA-Z\._0-9]*$',
+    '^integrations_by_bp\.*$',
+    '^integrations_by_data\.*$',
+    '^integrations_by_consumer\.*$',
+    '^integrations_by_src\.*$',
+    '^id\.*$',
+    '^kadzo*$',
+    '^kb_systems[a-zA-Z\._0-9]*$',
+    '^kb_system_id\.*$',
+    '^location\.*$',
+    '^load[a-zA-Z\._0-9]*$',
+    '^location[a-zA-Z\._0-9]*$',
+    '^live-stage\.*$',
+    '^live-stage-target\.*$',
+    '^target*$',
+    '^landscape*$',
+    '^validation.change-type_old*$',
+    '^validation.change-type*$',
+    '^group_id*$',
+    '^livestage*$',
+    '^grid*$',
+    '^location\.*$',
+    '^[a-zA-Z_\.]*menu{1}$',
+    '^menu[a-zA-Z\._0-9]*$',
+    '^measure\.*$',
+    '^MUE\.[a-zA-Z\._0-9]*$',
+    '^map_smartants[a-zA-Z\._0-9]*$',
+    '^monitoring[a-zA-Z\._0-9]*$',
+    '^master_system\.*$',
+    '^maximum\.*$',
+    '^MUEUsage.validation[a-zA-Z\._0-9]*$',
+    '^mm_discovery[a-zA-Z\._0-9]*$',
+    '^menu_root[a-zA-Z\._0-9]*$',
+    '^notationToTitleColor[a-zA-Z\._0-9]*$',
+    '^notationToBorderColor[a-zA-Z\._0-9]*$',
+    '^notationToColor[a-zA-Z\._0-9]*$',
+    '^nodes[a-zA-Z\._0-9]*$',
+    '^notation[a-zA-Z\._0-9]*$',
+    '^origin\.*$',
+    '^ownership[a-zA-Z\._0-9]*$',
+    '^plantuml[a-zA-Z\._0-9]*$',
+    '^overview[a-zA-Z\._0-9]*$',
+    '^objects[a-zA-Z\._0-9]*$',
+    '^$package\.*$',
+    '^params\.*$',
+    '^presentations\.*$',
+    '^patternProperties\.*$',
+    '^product_channels*$',
+    '^product_processes*$',
+    '^product_id*$',
+    '^channel_id*$',
+    '^products_by_bp\.$',
+    '^properties[a-zA-Z\._0-9]*$',
+    '^params*$',
+    '^presentations*$',
+    '^patternProperties[a-zA-Z\._0-9]*$',
+    '^placement[a-zA-Z\._0-9]*$',
+    '^products[a-zA-Z\._0-9]*$',
+    '^processes[a-zA-Z\._0-9]*$',
+    '^products_by_bp\.*$',
+    '^products_by_channel\.*$',
+    '^processes_by_integration\.*$',
+    '^processes_by_product\.*$',
+    '^processes_by_business_objects\.*$',
+    '^processes_by_system\.*$',
+    '^processes_by_integration\.*$',
+    '^processes_by_business_objects\.*$',
+    '^protected\.*$',
+    '^presentation_data_sa_config[a-zA-Z\._0-9]*$',
+    '^\$package[a-zA-Z\._0-9]*$',
+    '^props_to_summary[a-zA-Z\._0-9]*$',
+    '^parent\.*$',
+    '^registry\.*$',
+    '^rules[\.]*$',
+    '^report\.*$',
+    '^result[a-zA-Z\._0-9]*$',
+    '^rto\.*$',
+    '^rpo\.*$',
+    '^smartants\.*$',
+    '^subjects\.*$',
+    '^sber[a-zA-Z\._0-9]*$',
+    '^summary_livestage\.*$',
+    '^summary_performance\.*$',
+    '^sla\.*$',
+    '^sosna[a-zA-Z\._0-9]*$',
+    '^status\.*$',
+    '^schema_config[a-zA-Z\._0-9]*$',
+    '^settings[a-zA-Z\._0-9]*$',
+    '^style[a-zA-Z\._0-9]*$',
+    '^summary_ownership[a-zA-Z\._0-9]*$',
+    '^system[a-zA-Z\._0-9]*$',
+    '^summary_ownership[a-zA-Z\._0-9]*$',
+    '^summary_technologies\.*$',
+    '^summary_livestages\.*$',
+    '^summary_performance\.*$',
+    '^summary_performance\.*$',
+    '^software[a-zA-Z\._0-9]*$',
+    '^summary[a-zA-Z\._0-9]*$',
+    '^settings[a-zA-Z\._0-9]*$',
+    '^schemas[a-zA-Z\._0-9]*$',
+    '^sber_frame[a-zA-Z\._0-9]*$',
+    '^symbol[a-zA-Z\._0-9]*$',
+    '^strategy\.[a-zA-Z\._0-9]*$',
+    '^sec_zone[a-zA-Z\._0-9]*$',
+    '^scalability[a-zA-Z\._0-9]*$',
+    '^style[a-zA-Z\._0-9]*$',
+    '^schema\.*$',
+    '^summary\.*$',
+    '^strategy\.*$',
+    '^schema_[a-zA-Z\._0-9]*$',
+    '^smartants_arch_schemas[a-zA-Z\._0-9]*$',
+    '^security\.*$',
+    '^summary_livestage\.*$',
+    '^strategy_id\.*$',
+    '^summary_ownership\.*$',
+    '^test\.*$',
+    '^tech_services[a-zA-Z\._0-9]*$',
+    '^tech_params[a-zA-Z\._0-9]*$',
+    '^technical-use\.*$',
+    '^tech_landscape\.*$',
+    '^target-status\.*$',
+    '^to-be[a-zA-Z\._0-9]*$',
+    '^type[a-zA-Z\._0-9]*$',
+    '^tech_services[a-zA-Z\._0-9]*$',
+    '^tree\.*$',
+    '^template\.*$',
+    '^title\.$',
+    '^tech_params_by_systems[a-zA-Z\._0-9]*$',
+    '^tech_service_id[a-zA-Z\._0-9]*$',
+    '^ta_params[a-zA-Z\._0-9]*$',
+    '^v2022_migration_pack[a-zA-Z\._0-9]*$',
+    '^validators\.*$',
+    '^validation[a-zA-Z\._0-9]*$',
+    '^vendor[a-zA-Z\._0-9]*$',
+    '^version[a-zA-Z\._0-9]*$',
+    '^widgets\.*$',
+    '^wide_summary\.*$',
+    '^widgets_on_card[a-zA-Z\._0-9]*$',
+    '^uml\*$'
+];
+
+export const exclude = [
+    'patternProperties',
+    'headers',
+    'schema',
+    'functions',
+    'grid'
+];
\ No newline at end of file

From f817af4f15837a5b2f04195c535b414dcea28c94 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Wed, 10 Apr 2024 22:20:56 +0300
Subject: [PATCH 18/44] small fix rules

---
 src/backend/controllers/core.mjs    | 60 ++++++++++++++++++-------
 src/backend/controllers/storage.mjs |  5 ++-
 src/backend/helpers/datasets.mjs    |  9 ++--
 src/backend/storage/manager.mjs     | 70 +++++++++++++++++++++++++++++
 src/backend/utils/rules.mjs         | 49 ++++++++++++++++++++
 5 files changed, 172 insertions(+), 21 deletions(-)
 create mode 100644 src/backend/utils/rules.mjs

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 35264ae7..15ab2bde 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -5,6 +5,7 @@ import queries from '../../global/jsonata/queries.mjs';
 import helpers from './helpers.mjs';
 import compression from '../../global/compress/compress.mjs';
 import {getRoles} from '../helpers/jwt.mjs';
+import {getCurrentRuleId, getCurrentRules} from "../utils/rules.mjs";
 
 const compressor = compression();
 
@@ -12,9 +13,9 @@ const compressor = compression();
 export default (app) => {
 
     // Создает ответ на JSONata запрос и при необходимости кэширует ответ
-    function makeJSONataQueryResponse(res, query, params, subject, roles) {
-        cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject, roles }), async() => {
-            let ctx = roles.length === 0 ? app.storage.manifests['default'] : app.storage.manifests[roles];
+    function makeJSONataQueryResponse(res, query, params, subject, ruleId) {
+        cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject, ruleId }), async() => {
+            let ctx = ruleId === '' ? app.storage.manifests['default'] : app.storage.manifests[ruleId];
             return await datasets(app).parseSource(
                 ctx,
                 query,
@@ -24,6 +25,15 @@ export default (app) => {
         }, res);
     }
 
+    function checkRulesManifest(ruleName) {
+        for(let key in app.storage.manifests) {
+            if(key === ruleName) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     // Парсит переданные во внутреннем формате данные 
     function parseRequest(req) {
         return {
@@ -35,17 +45,20 @@ export default (app) => {
     }
 
     // Выполняет произвольные запросы 
-    app.get('/core/storage/jsonata/:query', function(req, res) {
+    app.get('/core/storage/jsonata/:query', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
         const roles = getRoles(req.headers);
-        app.storage = {...app.storage, roles: [...roles]};
+        const id = await getCurrentRuleId(roles);
+        const currentRules = await getCurrentRules(roles);
+        app.storage = {...app.storage, roles: [...currentRules],roleId: id};
+
         const request = parseRequest(req);
         const query = (request.query.length === 36) && queries.QUERIES[request.query]
             ? `(${queries.makeQuery(queries.QUERIES[request.query], request.params)})`
             : request.query;
 
-        makeJSONataQueryResponse(res, query, request.params, request.subject, roles);
+        makeJSONataQueryResponse(res, query, request.params, request.subject, id);
     });
 
     // Запрос на обновление манифеста
@@ -71,15 +84,15 @@ export default (app) => {
         if (!helpers.isServiceReady(app, res)) return;
 
         const roles = getRoles(req.headers);
+        const id = await getCurrentRuleId(roles);
+        const currentRules = await getCurrentRules(roles);
+        app.storage = {...app.storage, roles: [...currentRules], roleId: id};
 
-            console.log('apppp', app);
-            app.storage = {...app.storage, roles: [...roles]};
-            console.log('apppp', app);
             const request = parseRequest(req);
             cache.pullFromCache(app.storage.hash, JSON.stringify({
                 path: request.query,
                 params: request.params,
-                roles: roles
+                roles: id
             }), async () => {
                 if (request.query.startsWith('/'))
                     return await datasets(app).releaseData(request.query, request.params);
@@ -109,15 +122,30 @@ export default (app) => {
     });
 
     // Возвращает результат работы валидаторов
-    app.get('/core/storage/problems/', function(req, res) {
+    app.get('/core/storage/problems/', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
+
         const roles = getRoles(req.headers);
-        app.storage = {...app.storage, roles: [...roles]};
+        const currentRules = await getCurrentRules(roles);
+        const id = await getCurrentRuleId(roles);
+        app.storage = {...app.storage, roles: [...currentRules], roleId: id};
 
-        const value = roles.length !== 0 ? roles[0] : 'default';
-        const problems = app.storage.problems.filter(e => {
-            return e.key === value;
-        });
+        let problems;
+        if(id === '' ) {
+            problems = app.storage.problems.filter(e => {
+                return e.key === 'default';
+            });
+        } else if(checkRulesManifest(id)) {
+            problems = app.storage.problems.filter(e => {
+                return e.key === id;
+            });
+        } else {
+            app.new_rules = currentRules;
+            await storeManager.createNewManifest(app);
+            problems = app.storage.problems.filter(e => {
+                return e.key === id;
+            });
+        }
         res.json(problems || []);
     });
 };
diff --git a/src/backend/controllers/storage.mjs b/src/backend/controllers/storage.mjs
index 1160c1a9..007288de 100644
--- a/src/backend/controllers/storage.mjs
+++ b/src/backend/controllers/storage.mjs
@@ -1,6 +1,7 @@
 import logger from '../utils/logger.mjs';
 import request from '../helpers/request.mjs';
 import {getRoles} from '../helpers/jwt.mjs';
+import {getCurrentRuleId, getCurrentRules} from "../utils/rules.mjs";
 
 const LOG_TAG = 'controller-storage';
 
@@ -9,7 +10,9 @@ export default (app) => {
     app.get('/core/storage/:hash/*', async function(req, res) {
 
         const roles = getRoles(req.headers);
-        app.storage = {...app.storage, roles: [...roles]};
+        const currentRules = await getCurrentRules(roles);
+        const id = await getCurrentRuleId(roles);
+        app.storage = {...app.storage, roles: [...currentRules], roleId: id};
 
         const hash = req.params.hash || '$unknown$';
         const url = req.originalUrl.slice(`/core/storage/${hash}/`.length).replace(/\%E2\%86\%90/g, '..');
diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index 99d60f49..4e12dcd4 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -6,15 +6,16 @@ import entities from '../entities/entities.mjs';
 import md5 from 'md5';
 
 export default function(app) {
-	let ctx = app.storage.roles.length === 0 ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roles[0]];
-	entities(ctx);
+
+	let currentContext = app.storage.roleId === '' ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roleId];
+	entities(currentContext);
 	const result = Object.assign({}, datasetDriver,
 		{
 			// Возвращаем метаданных об объекте
 			pathResolver(path) {
 				return {
-					context: ctx,
-					subject: pathTool.get(ctx, path),
+					context: currentContext,
+					subject: pathTool.get(currentContext, path),
 					baseURI: app.storage.md5Map[md5(path)]
 				};
 			},
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index febdb6f1..ce8a9886 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -46,6 +46,76 @@ export default {
 	},
 	// Стек обработчиков события на обновление манифеста
 	onApplyManifest: [],
+	createNewManifest: async function(app) {
+		let matchRegex = (string, filters) => {
+
+			var len = filters.length, i = 0;
+
+			for (; i < len; i++) {
+				if (string.match(filters[i])) {
+					return true;
+				}
+			}
+			return false;
+		};
+
+		let matchExclude = (string) => {
+			var len = exclude.length, i = 0;
+
+			for (; i < len; i++) {
+				if (string === exclude[i]) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		function cleanData(manifest, filters) {
+			if (typeof manifest != "object") return;
+			if (!manifest) return;
+
+			for (const key in manifest) {
+				if(matchExclude(key) || typeof manifest[key] != 'object')
+					continue;
+
+				if(matchRegex(key, filters))  {
+					cleanData(manifest[key], filters);
+				} else {
+					delete manifest[key];
+				}
+			}
+		}
+
+
+		if(app.new_rules) {
+
+			const mergeRules = [];
+			const ids = [];
+
+			let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+			const response = await cache.request(uri, '/');
+
+			const manifest = response && (typeof response.data === 'object'
+				? response.data
+				: JSON.parse(response.data));
+
+			for(let rule in app.new_rules) {
+				for(let nRule in manifest?.roles) {
+					if(app.new_rules[rule] === nRule) {
+						mergeRules.push(manifest?.roles[nRule]);
+						ids.push(nRule)
+					}
+				}
+			}
+
+			const id = ids.sort((a,b) => {return a.localeCompare(b);}).join('');
+			let rawManifest = lodash.cloneDeep(app.storage.manifests.origin);
+			cleanData(rawManifest, systemRules.concat(mergeRules));
+			app.storage.manifests[id] = rawManifest;
+			app.storage.problems = [];
+			validators(app);
+		}
+	},
 	reloadManifest: async function(app) {
 
 		console.log('reloadManifest');
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
new file mode 100644
index 00000000..e3969bda
--- /dev/null
+++ b/src/backend/utils/rules.mjs
@@ -0,0 +1,49 @@
+import cache from "../storage/cache.mjs";
+
+export async function getCurrentRuleId(rules) {
+    if(rules.length === 0) return '';
+
+    const ids = [];
+
+    let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+    const response = await cache.request(uri, '/');
+
+    const manifest = response && (typeof response.data === 'object'
+        ? response.data
+        : JSON.parse(response.data));
+
+
+    for(let rule in rules) {
+        for(let nRule in manifest?.roles) {
+            if(rules[rule] === nRule) {
+                ids.push(nRule)
+            }
+        }
+    }
+
+    return ids.sort((a,b) => {return a.localeCompare(b);}).join('');
+}
+
+export async function getCurrentRules(rules) {
+    if(rules.length === 0) return [];
+
+    const result = [];
+
+    let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+    const response = await cache.request(uri, '/');
+
+    const manifest = response && (typeof response.data === 'object'
+        ? response.data
+        : JSON.parse(response.data));
+
+    for(let rule in rules) {
+        for(let nRule in manifest?.roles) {
+            if(rules[rule] === nRule) {
+                result.push(nRule);
+            }
+        }
+    }
+    return result;
+}
+
+

From 03d2ca33aaada7f85492d9f26410ca508cbd6315 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 11 Apr 2024 11:51:02 +0300
Subject: [PATCH 19/44] remove ecogroup

---
 src/backend/storage/system-rules.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/storage/system-rules.mjs b/src/backend/storage/system-rules.mjs
index 87274557..44131a22 100644
--- a/src/backend/storage/system-rules.mjs
+++ b/src/backend/storage/system-rules.mjs
@@ -88,7 +88,6 @@ export const systemRules = [
     '^entities\.*$',
     '^extra-links\.*$',
     '^\$error[a-zA-Z\._0-9]*$',
-    '^ecogroup\.[a-zA-Z\._0-9]*$',
     '^elk[a-zA-Z\._0-9]*$',
     '^fetchLinks\.*$',
     '^function_id\.*$',

From ec684e3f55a7b6d4f137b375b7466f601171beaf Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 11 Apr 2024 13:56:08 +0300
Subject: [PATCH 20/44] small fix

---
 src/backend/controllers/core.mjs     | 16 ++--------------
 src/backend/helpers/validators.mjs   |  5 ++---
 src/backend/storage/manager.mjs      |  3 +--
 src/backend/storage/system-rules.mjs |  1 +
 src/backend/utils/rules.mjs          |  2 +-
 src/global/rules/validators.mjs      |  4 +---
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 15ab2bde..bc9728c0 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -130,23 +130,11 @@ export default (app) => {
         const id = await getCurrentRuleId(roles);
         app.storage = {...app.storage, roles: [...currentRules], roleId: id};
 
-        let problems;
-        if(id === '' ) {
-            problems = app.storage.problems.filter(e => {
-                return e.key === 'default';
-            });
-        } else if(checkRulesManifest(id)) {
-            problems = app.storage.problems.filter(e => {
-                return e.key === id;
-            });
-        } else {
+        if(!checkRulesManifest(id)) {
             app.new_rules = currentRules;
             await storeManager.createNewManifest(app);
-            problems = app.storage.problems.filter(e => {
-                return e.key === id;
-            });
         }
-        res.json(problems || []);
+        res.json(app.storage.problems || []);
     });
 };
 
diff --git a/src/backend/helpers/validators.mjs b/src/backend/helpers/validators.mjs
index f868e6bf..c52cb508 100644
--- a/src/backend/helpers/validators.mjs
+++ b/src/backend/helpers/validators.mjs
@@ -11,9 +11,8 @@ export default function(app) {
 		app.storage.problems.push(validator);
 	};
 	logger.log('Executing validators..', LOG_TAG);
-	for (const key in app.storage.manifests) {
-		validators(datasets(app), app.storage.manifests[key], pushValidator, pushValidator, key);
-	}
+
+	validators(datasets(app), app.storage.manifests[app.storage.roleId], pushValidator, pushValidator);
 
 	logger.log('Done.', LOG_TAG);
 
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index ce8a9886..37289c91 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -112,8 +112,6 @@ export default {
 			let rawManifest = lodash.cloneDeep(app.storage.manifests.origin);
 			cleanData(rawManifest, systemRules.concat(mergeRules));
 			app.storage.manifests[id] = rawManifest;
-			app.storage.problems = [];
-			validators(app);
 		}
 	},
 	reloadManifest: async function(app) {
@@ -206,6 +204,7 @@ export default {
 			mergeMap: {},								// Карта склейки объектов
 			md5Map: {}, 								// Карта путей к ресурсам по md5 пути
 			manifests: {...localStorage.manifests},
+			roleId: 'default',
 			// Ошибки, которые возникли при загрузке манифестов
 			// по умолчанию заполняем ошибками, которые возникли при загрузке
 			problems: Object.keys(cache.errors || {}).map((key) => cache.errors[key]) || []
diff --git a/src/backend/storage/system-rules.mjs b/src/backend/storage/system-rules.mjs
index 44131a22..87274557 100644
--- a/src/backend/storage/system-rules.mjs
+++ b/src/backend/storage/system-rules.mjs
@@ -88,6 +88,7 @@ export const systemRules = [
     '^entities\.*$',
     '^extra-links\.*$',
     '^\$error[a-zA-Z\._0-9]*$',
+    '^ecogroup\.[a-zA-Z\._0-9]*$',
     '^elk[a-zA-Z\._0-9]*$',
     '^fetchLinks\.*$',
     '^function_id\.*$',
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
index e3969bda..d43fe73f 100644
--- a/src/backend/utils/rules.mjs
+++ b/src/backend/utils/rules.mjs
@@ -1,7 +1,7 @@
 import cache from "../storage/cache.mjs";
 
 export async function getCurrentRuleId(rules) {
-    if(rules.length === 0) return '';
+    if(rules.length === 0) return 'default';
 
     const ids = [];
 
diff --git a/src/global/rules/validators.mjs b/src/global/rules/validators.mjs
index 3405c343..65de1c0c 100644
--- a/src/global/rules/validators.mjs
+++ b/src/global/rules/validators.mjs
@@ -1,5 +1,5 @@
 // Выполняет валидаторы и накладывает исключения
-export default function(datasets, manifest, success, reject, key) {
+export default function(datasets, manifest, success, reject) {
 	const rules = (manifest['rules'] || {});
 	const validators = rules['validators'] || {};
 	const exceptions = rules['exceptions'] || {};
@@ -9,7 +9,6 @@ export default function(datasets, manifest, success, reject, key) {
 			.then((items) => {
 				success({
 					id,
-					key,
 					title: validators[id].title || id,
 					items: (items || []).map((item) => {
 						return Object.assign({
@@ -21,7 +20,6 @@ export default function(datasets, manifest, success, reject, key) {
 				reject(
 					{
 						id,
-						key,
 						title: validators[id].title || id,
 						error,
 						items: [

From a141ca7fa8b248517701b647954906fe8e3dcf6e Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 11 Apr 2024 14:46:32 +0300
Subject: [PATCH 21/44] small fix

---
 src/backend/controllers/core.mjs | 2 +-
 src/backend/helpers/datasets.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index bc9728c0..999f7a17 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -115,7 +115,7 @@ export default (app) => {
                         }
                         return await ds.getData(path.context, profile, params, path.baseURI);
                     } else {
-                        return await ds.getData(app.storage.manifest, profile, params);
+                        return await ds.getData(app.storage.manifests[id], profile, params);
                     }
                 }
             }, res);
diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index 4e12dcd4..7840c4e9 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -7,7 +7,7 @@ import md5 from 'md5';
 
 export default function(app) {
 
-	let currentContext = app.storage.roleId === '' ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roleId];
+	let currentContext = app.storage.roleId === 'default' ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roleId];
 	entities(currentContext);
 	const result = Object.assign({}, datasetDriver,
 		{

From da9dc8973204b0dd230161021f96621f0dcd1eee Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 11 Apr 2024 15:34:28 +0300
Subject: [PATCH 22/44] small fix

---
 src/backend/storage/manager.mjs      | 4 ++--
 src/backend/storage/system-rules.mjs | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 37289c91..102b45fb 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -89,7 +89,7 @@ export default {
 
 		if(app.new_rules) {
 
-			const mergeRules = [];
+			let mergeRules = [];
 			const ids = [];
 
 			let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
@@ -102,7 +102,7 @@ export default {
 			for(let rule in app.new_rules) {
 				for(let nRule in manifest?.roles) {
 					if(app.new_rules[rule] === nRule) {
-						mergeRules.push(manifest?.roles[nRule]);
+						mergeRules = mergeRules.concat(manifest?.roles[nRule]);
 						ids.push(nRule)
 					}
 				}
diff --git a/src/backend/storage/system-rules.mjs b/src/backend/storage/system-rules.mjs
index 87274557..44131a22 100644
--- a/src/backend/storage/system-rules.mjs
+++ b/src/backend/storage/system-rules.mjs
@@ -88,7 +88,6 @@ export const systemRules = [
     '^entities\.*$',
     '^extra-links\.*$',
     '^\$error[a-zA-Z\._0-9]*$',
-    '^ecogroup\.[a-zA-Z\._0-9]*$',
     '^elk[a-zA-Z\._0-9]*$',
     '^fetchLinks\.*$',
     '^function_id\.*$',

From f66ca945ca1c809f519120e2ec1f50e9ea7eb0ab Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Mon, 22 Apr 2024 08:40:57 +0300
Subject: [PATCH 23/44] fix duplication problems

---
 src/frontend/storage/gitlab.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frontend/storage/gitlab.js b/src/frontend/storage/gitlab.js
index 2c83883f..c5b8802e 100644
--- a/src/frontend/storage/gitlab.js
+++ b/src/frontend/storage/gitlab.js
@@ -99,7 +99,9 @@ export default {
 			Vue.set(state.last_changes, value.id, value.payload);
 		},
 		appendProblems(state, value) {
-			state.problems = state.problems.concat([value]);
+      if(!state.problems?.find(({ id }) => id === value.id)) {
+        state.problems = state.problems.concat([value]);
+      }
 		},
 		setRenderCore(state, value) {
 			state.renderCore = value;

From 36be161b287656e0315a3cf1fe1756982fc7495d Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 14:43:40 +0300
Subject: [PATCH 24/44] add docs + refactoring

---
 example.env                                   | 39 ++++++++++++++
 oidc-settings.js                              |  4 +-
 .../docs/manual/entities/rules.md             | 28 ++++++++++
 public/documentation/docs/manual/root.yaml    |  5 ++
 src/backend/storage/manager.mjs               |  2 +-
 src/frontend/storage/gitlab.js                |  9 +---
 src/global/manifest/parser.mjs                | 53 -------------------
 7 files changed, 77 insertions(+), 63 deletions(-)
 create mode 100644 public/documentation/docs/manual/entities/rules.md

diff --git a/example.env b/example.env
index 9eca02f6..1466b369 100644
--- a/example.env
+++ b/example.env
@@ -153,6 +153,45 @@
 # По умолчанию кластер выключен (off).
 # VUE_APP_DOCHUB_CLUSTER= on / off
 
+# ***********************************************************
+#                   Пример конфигурирования ролевой модели
+# ***********************************************************
+# (B) Режим backend
+# Указываем путь до манифеста с описанием ролей
+# Пример описания:
+# roles:
+#   users:
+#     - '^kadzo.v2023.data_objects*$'
+#     - '^ecogroup.berezka.data_objects[a-zA-Z\._0-9]*$'
+#   uek:
+#     - '^kadzo\.v2023\.kb_systems[a-zA-Z\._0-9]*$'
+#     - '^ecogroup.berezka.kb[a-zA-Z\._0-9]*$'
+#   default:
+#     - '^kadzo\.v2023\.data_objects*$'
+#VUE_APP_DOCHUB_ROLES=workspace/sberauto/roles.yaml
+
+# Варианты использования:
+#   documentation/roles.yaml - (F / FB) Относительная ссылка на файл расположенный в папке @/public/
+#   https://dochub.info/documentation/roles.yaml - (F / FB) прямая ссылка на внешний http/https ресурс
+#   gitlab:34:main@roles.yaml - Прямая ссылка на на файл в GitLab репозитории.
+#                              (F) Может использоваться только при указании VUE_APP_DOCHUB_PERSONAL_TOKEN или VUE_APP_DOCHUB_GITLAB_URL + VUE_APP_DOCHUB_APP_ID
+#                              (FB) Может использоваться только при указании VUE_APP_DOCHUB_PERSONAL_TOKEN
+#       Структура ссылки:
+#       gitlab      - протокол GitLab
+#       34          - идентификатор репозитория
+#       main        - бранч
+#       root.yaml   - путь к файлу
+#
+#   file://roles.yaml - (FB) Прямая ссылка на файл в хранилище VUE_APP_DOCHUB_BACKEND_FILE_STORAGE.
+#                       Если VUE_APP_DOCHUB_BACKEND_FILE_STORAGE не задан, то ./public/*
+#   bitbucket:myproject:myrepo:mybranch@roles.yaml Прямая ссылка на на файл в BitBucket репозитории.
+#                              (F/FB) Может использоваться только при указании VUE_APP_DOCHUB_PERSONAL_TOKEN
+# Указываем путь до сервера аутентификации с указанием realms
+#VUE_APP_DOCHUB_AUTHORITY_SERVER=https://auth.slsdev.ru/realms/dochub
+# Указываем client id
+#VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID=dochub
+# {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
+#VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
 
 
 # ***********************************************************
diff --git a/oidc-settings.js b/oidc-settings.js
index 0d482f92..8c75f4e1 100644
--- a/oidc-settings.js
+++ b/oidc-settings.js
@@ -6,8 +6,8 @@ Log.setLevel(Log.ERROR);
 const url = window.location.origin;
 
 export const settings = {
-    authority: 'https://auth.slsdev.ru/cfbRYTbCu86vSIbmWCQk/realms/dochub',
-    client_id: 'dochub',
+    authority: process.env.VUE_APP_DOCHUB_AUTHORITY_SERVER,
+    client_id: process.env.VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID,
     redirect_uri: new URL('/login', url),
     post_logout_redirect_uri: new URL('/logout', url),
     response_type: 'code',
diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
new file mode 100644
index 00000000..d290b656
--- /dev/null
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -0,0 +1,28 @@
+# Ролевая модель
+
+Ролевая модель - позволяет разграничивать доступы к элементам архитектуры. 
+Управление ролями пользователей происходит на стороне keycloack.
+
+Описание ролей осуществляется в корневом файле roles.yaml
+Пример описания правил доступа:
+```
+ roles:
+   users:
+     - '^kadzo.v2023.data_objects*$' // Правило представляет собой регулярное выражение
+     - '^ecogroup.berezka.data_objects[a-zA-Z\._0-9]*$'
+   uek:
+     - '^kadzo\.v2023\.kb_systems[a-zA-Z\._0-9]*$'
+     - '^ecogroup.berezka.kb[a-zA-Z\._0-9]*$'
+   default:
+     - '^kadzo\.v2023\.data_objects*$'
+```
+Если пользователь имеет несколько ролей, то наборы правил объединяются.
+
+Для работы ролевой модели требуется дополнительно указать в файле .env несколько параметров:
+
+Указываем путь до сервера аутентификации с указанием realms
+VUE_APP_DOCHUB_AUTHORITY_SERVER=https://dochub-server.ru/realms/dochub
+Указываем client id
+VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID=dochub
+{PUBLIC KEY} - указываем public key, смотрим настройки keycloack
+VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
diff --git a/public/documentation/docs/manual/root.yaml b/public/documentation/docs/manual/root.yaml
index 43e7ee67..79052636 100755
--- a/public/documentation/docs/manual/root.yaml
+++ b/public/documentation/docs/manual/root.yaml
@@ -130,6 +130,11 @@ docs:
       subjects:
         - dochub.front
       source: config/deployment.md
+    dochub.rules:
+      location: Dochub/Ролевая модель
+      description: Ролевая модель
+      type: markdown
+      source: entities/rules.md
     dochub.context.source:
       type: plantuml
       source: context_source.puml
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 102b45fb..ff3bd54a 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -195,7 +195,7 @@ export default {
 
 		console.log('manifestParser.manifest', localStorage.manifests.origin);
 
-		entities(localStorage.manifests['default']); //TODO: уточнить!!!
+		entities(localStorage.manifests['default']);
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {
diff --git a/src/frontend/storage/gitlab.js b/src/frontend/storage/gitlab.js
index c5b8802e..8d6607cb 100644
--- a/src/frontend/storage/gitlab.js
+++ b/src/frontend/storage/gitlab.js
@@ -57,8 +57,7 @@ export default {
 		// Признак инциализации проекта в плагине
 		notInited: null,
 		// Признак критической проблемы
-		criticalError: null,
-    available_roles: {} //TODO: посмотреть!!!
+		criticalError: null
 	},
 
 	mutations: {
@@ -70,7 +69,6 @@ export default {
 			state.projects = {};
 			state.last_changes = {};
 			state.criticalError = null;
-      state.available_roles = {};
 		},
 		setManifest(state, value) {
 			state.moment = Date.now();
@@ -114,10 +112,7 @@ export default {
 		},
 		setPrintVersion(state, value) {
 			state.isPrintVersion = value;
-		},
-    setAvailableRoles(state, value) {
-      state.available_roles = value;
-    }
+		}
 	},
 
 	actions: {
diff --git a/src/global/manifest/parser.mjs b/src/global/manifest/parser.mjs
index eff4e8ea..44661aea 100644
--- a/src/global/manifest/parser.mjs
+++ b/src/global/manifest/parser.mjs
@@ -239,62 +239,9 @@ const parser = {
 	// Разбираем сущности
 	// path - путь к перечислению сущностей (ключ -> объект)
 	async parseEntity(context, path, baseURI) {
-		//if(Array.isArray(this.filters) && !this.filters.length) {
 			for (const key in context) {
 				await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
 			}
-		//} else {
-		//	for (const key in context) {
-		//		for(const filter in this.filters) {
-		//			if(key.match(this.filters[filter])) {
-		//				console.log('---------------------------');
-		//				console.log('key',key);
-			//			console.log('value',context[key]);
-			//			console.log('---------------------------');
-			//			await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
-			//		}
-			//	}
-			//}
-		//}
-
-
-		//TODO: Смотреть сюда!!!! winodw.Vuex.state....roles
-		// let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
-		//
-		// try {
-		// 	const response = this.onPullSource
-		// 		? await this.onPullSource(uri, '/', this)
-		// 		: await parser.cache.request(uri, '/');
-		//
-		// 	const manifest = response && (typeof response.data === 'object'
-		// 		? response.data
-		// 		: JSON.parse(response.data));
-		//
-		// 	let userRoles = this.app?.storage?.roles;
-		// 	console.log('userRoles', userRoles);
-		//
-		// 	let filters;
-		// 	if(Array.isArray(userRoles) && userRoles.length) {
-		// 		filters = manifest?.roles[userRoles[0]]; // формировать полный список фильтров по ролям
-		// 	} else {
-		// 		filters = manifest?.roles['default'];
-		// 	}
-		//
-		// 	for (const key in context) {
-		// 		for(const filter in filters) {
-		// 			if(key.match(filters[filter])) {
-		// 				console.log('---------------------------');
-		// 				console.log('key',key);
-		// 				console.log('value',context[key]);
-		// 				console.log('---------------------------');
-		// 				await this.expandProperty(context[key], `${path}/${encodeURIComponent(key)}`, baseURI);
-		// 			}
-		// 		}
-		// 	}
-		//
-		// } catch (e) {
-		// 	this.registerError(e, e.uri || uri);
-		// }
 	},
 
 	async parseImports(manifest, baseURI) {

From cef5cbb3da96a72f69ec502ef125441388d728f5 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 15:07:32 +0300
Subject: [PATCH 25/44] small fix env variable

---
 example.env                                        | 2 +-
 public/documentation/docs/manual/entities/rules.md | 3 +++
 src/backend/storage/manager.mjs                    | 4 ++--
 src/backend/utils/rules.mjs                        | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/example.env b/example.env
index 1466b369..d8d5d93a 100644
--- a/example.env
+++ b/example.env
@@ -168,7 +168,7 @@
 #     - '^ecogroup.berezka.kb[a-zA-Z\._0-9]*$'
 #   default:
 #     - '^kadzo\.v2023\.data_objects*$'
-#VUE_APP_DOCHUB_ROLES=workspace/sberauto/roles.yaml
+#VUE_APP_DOCHUB_ROLES=file:///workspace/sberauto/roles.yaml
 
 # Варианты использования:
 #   documentation/roles.yaml - (F / FB) Относительная ссылка на файл расположенный в папке @/public/
diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
index d290b656..d3686528 100644
--- a/public/documentation/docs/manual/entities/rules.md
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -16,10 +16,13 @@
    default:
      - '^kadzo\.v2023\.data_objects*$'
 ```
+VUE_APP_DOCHUB_ROLES=file:///workspace/sberauto/roles.yaml
+
 Если пользователь имеет несколько ролей, то наборы правил объединяются.
 
 Для работы ролевой модели требуется дополнительно указать в файле .env несколько параметров:
 
+
 Указываем путь до сервера аутентификации с указанием realms
 VUE_APP_DOCHUB_AUTHORITY_SERVER=https://dochub-server.ru/realms/dochub
 Указываем client id
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index ff3bd54a..e8789561 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -92,7 +92,7 @@ export default {
 			let mergeRules = [];
 			const ids = [];
 
-			let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+			let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
 			const response = await cache.request(uri, '/');
 
 			const manifest = response && (typeof response.data === 'object'
@@ -171,7 +171,7 @@ export default {
 
 		let createRoleManifest = async function () {
 			try {
-				let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+				let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
 				const response = await cache.request(uri, '/');
 
 				const manifest = response && (typeof response.data === 'object'
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
index d43fe73f..2c237870 100644
--- a/src/backend/utils/rules.mjs
+++ b/src/backend/utils/rules.mjs
@@ -5,7 +5,7 @@ export async function getCurrentRuleId(rules) {
 
     const ids = [];
 
-    let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+    let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
     const response = await cache.request(uri, '/');
 
     const manifest = response && (typeof response.data === 'object'
@@ -29,7 +29,7 @@ export async function getCurrentRules(rules) {
 
     const result = [];
 
-    let uri = `file:///${process.env.VUE_APP_DOCHUB_ROLES}`;
+    let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
     const response = await cache.request(uri, '/');
 
     const manifest = response && (typeof response.data === 'object'

From 623d65e8dc0358a99b6b019b7d094b8fb6f99b44 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 16:25:23 +0300
Subject: [PATCH 26/44] small fix

---
 public/documentation/docs/manual/root.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/documentation/docs/manual/root.yaml b/public/documentation/docs/manual/root.yaml
index 79052636..702f9fd1 100755
--- a/public/documentation/docs/manual/root.yaml
+++ b/public/documentation/docs/manual/root.yaml
@@ -131,7 +131,7 @@ docs:
         - dochub.front
       source: config/deployment.md
     dochub.rules:
-      location: Dochub/Ролевая модель
+      location: Dochub/Руководство/Ролевая модель
       description: Ролевая модель
       type: markdown
       source: entities/rules.md

From 840d0cd0bf0bfe852f1ef9b05ea5914d1fa27f88 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 16:26:31 +0300
Subject: [PATCH 27/44] small fix

---
 example.env                                        | 2 +-
 public/documentation/docs/manual/entities/rules.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index d8d5d93a..f3c7854f 100644
--- a/example.env
+++ b/example.env
@@ -189,7 +189,7 @@
 # Указываем путь до сервера аутентификации с указанием realms
 #VUE_APP_DOCHUB_AUTHORITY_SERVER=https://auth.slsdev.ru/realms/dochub
 # Указываем client id
-#VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID=dochub
+#VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID={CLIENTID}
 # {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
 #VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
 
diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
index d3686528..7775c59b 100644
--- a/public/documentation/docs/manual/entities/rules.md
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -26,6 +26,6 @@ VUE_APP_DOCHUB_ROLES=file:///workspace/sberauto/roles.yaml
 Указываем путь до сервера аутентификации с указанием realms
 VUE_APP_DOCHUB_AUTHORITY_SERVER=https://dochub-server.ru/realms/dochub
 Указываем client id
-VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID=dochub
+VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID={CLIENTID}
 {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
 VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----

From 0bc4642068c0305cad1157057d4ada8db06bc852 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 16:33:21 +0300
Subject: [PATCH 28/44] small fix

---
 example.env                                        | 2 +-
 public/documentation/docs/manual/entities/rules.md | 2 +-
 public/documentation/docs/manual/root.yaml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/example.env b/example.env
index f3c7854f..2a05eeb3 100644
--- a/example.env
+++ b/example.env
@@ -188,7 +188,7 @@
 #                              (F/FB) Может использоваться только при указании VUE_APP_DOCHUB_PERSONAL_TOKEN
 # Указываем путь до сервера аутентификации с указанием realms
 #VUE_APP_DOCHUB_AUTHORITY_SERVER=https://auth.slsdev.ru/realms/dochub
-# Указываем client id
+# Указываем client id, например: dochub
 #VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID={CLIENTID}
 # {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
 #VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
index 7775c59b..0eced7cb 100644
--- a/public/documentation/docs/manual/entities/rules.md
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -25,7 +25,7 @@ VUE_APP_DOCHUB_ROLES=file:///workspace/sberauto/roles.yaml
 
 Указываем путь до сервера аутентификации с указанием realms
 VUE_APP_DOCHUB_AUTHORITY_SERVER=https://dochub-server.ru/realms/dochub
-Указываем client id
+Указываем client id, например: dochub
 VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID={CLIENTID}
 {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
 VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
diff --git a/public/documentation/docs/manual/root.yaml b/public/documentation/docs/manual/root.yaml
index 702f9fd1..3b255aa5 100755
--- a/public/documentation/docs/manual/root.yaml
+++ b/public/documentation/docs/manual/root.yaml
@@ -131,7 +131,7 @@ docs:
         - dochub.front
       source: config/deployment.md
     dochub.rules:
-      location: Dochub/Руководство/Ролевая модель
+      location: DocHub/Руководство/Ролевая модель
       description: Ролевая модель
       type: markdown
       source: entities/rules.md

From 52566d6755e0ae37e7952b3cf19414964705e46f Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 23 Apr 2024 16:40:30 +0300
Subject: [PATCH 29/44] small fix

---
 public/documentation/docs/manual/entities/rules.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
index 0eced7cb..0b40c64a 100644
--- a/public/documentation/docs/manual/entities/rules.md
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -22,10 +22,11 @@ VUE_APP_DOCHUB_ROLES=file:///workspace/sberauto/roles.yaml
 
 Для работы ролевой модели требуется дополнительно указать в файле .env несколько параметров:
 
-
+```
 Указываем путь до сервера аутентификации с указанием realms
 VUE_APP_DOCHUB_AUTHORITY_SERVER=https://dochub-server.ru/realms/dochub
 Указываем client id, например: dochub
 VUE_APP_DOCHUB_AUTHORITY_CLIENT_ID={CLIENTID}
 {PUBLIC KEY} - указываем public key, смотрим настройки keycloack
 VUE_APP_DOCHUB_AUTH_PUBLIC_KEY=-----BEGIN PUBLIC KEY-----{PUBLIC KEY}-----END PUBLIC KEY-----
+```

From f1041b745950d32e9130acbe89f2d2a280326da5 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Fri, 3 May 2024 12:48:52 +0300
Subject: [PATCH 30/44] added timeout

---
 src/backend/main.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/main.mjs b/src/backend/main.mjs
index 1853478e..82a054b6 100644
--- a/src/backend/main.mjs
+++ b/src/backend/main.mjs
@@ -18,6 +18,7 @@ const serverPort = process.env.VUE_APP_DOCHUB_BACKEND_PORT || 3030;
 
 // Актуальный манифест
 app.storage = null;
+app.set
 
 // Подключаем контроль доступа
 middlewareAccess(app);
@@ -25,10 +26,12 @@ middlewareAccess(app);
 // Основной цикл приложения
 const mainLoop = async function() {
     // Загружаем манифест
-    app.listen(serverPort, function(){
+    const server = app.listen(serverPort, function(){
         logger.log(`DocHub server running on ${serverPort}`, LOG_TAG);
     });
 
+    server.setTimeout(500000);
+
      storeManager.reloadManifest(app)
          .then(async(storage) => {
              await storeManager.applyManifest(app, storage);

From 9773f9fd08ac86a90c1f8a38aaff75c4d04bcadd Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Fri, 3 May 2024 12:52:12 +0300
Subject: [PATCH 31/44] added timeout

---
 src/backend/main.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/main.mjs b/src/backend/main.mjs
index 82a054b6..f1c704d7 100644
--- a/src/backend/main.mjs
+++ b/src/backend/main.mjs
@@ -18,7 +18,6 @@ const serverPort = process.env.VUE_APP_DOCHUB_BACKEND_PORT || 3030;
 
 // Актуальный манифест
 app.storage = null;
-app.set
 
 // Подключаем контроль доступа
 middlewareAccess(app);

From 58b83437ec481826c9f43ae9adaca20807b69b6f Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 16 May 2024 12:45:37 +0300
Subject: [PATCH 32/44] small fix rules model

---
 src/backend/storage/manager.mjs      |  60 +++---
 src/backend/storage/system-rules.mjs | 271 ---------------------------
 2 files changed, 37 insertions(+), 294 deletions(-)
 delete mode 100644 src/backend/storage/system-rules.mjs

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index e8789561..11b2102b 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -7,10 +7,10 @@ import validators from '../helpers/validators.mjs';
 import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
 import lodash from 'lodash';
-import {systemRules, exclude} from './system-rules.mjs';
 
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import jsonataFunctions from '../../global/jsonata/functions.mjs';
+import path from "path";
 
 const LOG_TAG = 'storage-manager';
 
@@ -59,7 +59,7 @@ export default {
 			return false;
 		};
 
-		let matchExclude = (string) => {
+		let matchExclude = (string, exclude) => {
 			var len = exclude.length, i = 0;
 
 			for (; i < len; i++) {
@@ -70,16 +70,16 @@ export default {
 			return false;
 		}
 
-		function cleanData(manifest, filters) {
+		function cleanData(manifest, filters, exclude) {
 			if (typeof manifest != "object") return;
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				if(matchExclude(key) || typeof manifest[key] != 'object')
+				if(matchExclude(key, exclude) || typeof manifest[key] != 'object')
 					continue;
 
 				if(matchRegex(key, filters))  {
-					cleanData(manifest[key], filters);
+					cleanData(manifest[key], filters, exclude);
 				} else {
 					delete manifest[key];
 				}
@@ -93,11 +93,13 @@ export default {
 			const ids = [];
 
 			let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-			const response = await cache.request(uri, '/');
 
-			const manifest = response && (typeof response.data === 'object'
-				? response.data
-				: JSON.parse(response.data));
+			const dirname = path.dirname(uri);
+			const defaultRoles = await loader(`${dirname}/default.yaml`);
+			const systemRules = defaultRoles?.roles;
+			const exclude = defaultRoles?.exclude;
+
+			const manifest = await loader(uri);
 
 			for(let rule in app.new_rules) {
 				for(let nRule in manifest?.roles) {
@@ -110,7 +112,7 @@ export default {
 
 			const id = ids.sort((a,b) => {return a.localeCompare(b);}).join('');
 			let rawManifest = lodash.cloneDeep(app.storage.manifests.origin);
-			cleanData(rawManifest, systemRules.concat(mergeRules));
+			cleanData(rawManifest, systemRules.concat(mergeRules), exclude);
 			app.storage.manifests[id] = rawManifest;
 		}
 	},
@@ -142,7 +144,7 @@ export default {
 			return false;
 		};
 
-		let matchExclude = (string) => {
+		let matchExclude = (string, exclude) => {
 			var len = exclude.length, i = 0;
 
 			for (; i < len; i++) {
@@ -153,16 +155,23 @@ export default {
 			return false;
 		}
 
-		function cleanData(manifest, filters) {
+		async function loader(uri) {
+			const response = await cache.request(uri, '/');
+			return response && (typeof response.data === 'object'
+				? response.data
+				: JSON.parse(response.data));
+		}
+
+		function cleanData(manifest, filters, exclude) {
 			if (typeof manifest != "object") return;
 			if (!manifest) return;
 
 			for (const key in manifest) {
-				if(matchExclude(key) || typeof manifest[key] != 'object')
+				if(matchExclude(key, exclude) || typeof manifest[key] != 'object')
 					continue;
 
 				if(matchRegex(key, filters))  {
-					cleanData(manifest[key], filters);
+					cleanData(manifest[key], filters, exclude);
 				} else {
 					delete manifest[key];
 				}
@@ -172,17 +181,22 @@ export default {
 		let createRoleManifest = async function () {
 			try {
 				let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-				const response = await cache.request(uri, '/');
 
-				const manifest = response && (typeof response.data === 'object'
-					? response.data
-					: JSON.parse(response.data));
+				const dirname = path.dirname(uri);
+				const defaultRoles = await loader(`${dirname}/default.yaml`);
+				const systemRules = defaultRoles?.roles;
+				const exclude = defaultRoles?.exclude;
+
+				const manifest = await loader(uri);
+
+
+				for (const key in manifest?.roles) {
+					let rawManifest = lodash.cloneDeep(localStorage.manifests.origin);
+					cleanData(rawManifest, systemRules.concat(manifest?.roles[key]), exclude);
+					localStorage.manifests[key] = rawManifest;
+				}
+
 
-					for (const key in manifest?.roles) {
-						let rawManifest = lodash.cloneDeep(localStorage.manifests.origin);
-						cleanData(rawManifest, systemRules.concat(manifest?.roles[key]));
-						localStorage.manifests[key] = rawManifest;
-					}
 
 			} catch (e) {
 				this.registerError(e, e.uri || uri);
diff --git a/src/backend/storage/system-rules.mjs b/src/backend/storage/system-rules.mjs
deleted file mode 100644
index 44131a22..00000000
--- a/src/backend/storage/system-rules.mjs
+++ /dev/null
@@ -1,271 +0,0 @@
-export const systemRules = [
-    '^aspects[a-zA-Z\._0-9]*$',
-    '^api\.*$',
-    '^data-objects*$',
-    '^technologies*$',
-    '^app_landscape\.*$',
-    '^as-is[a-zA-Z\._0-9]*$',
-    '^$after\.*$',
-    '^average\.*$',
-    '^required\.*$',
-    '^arch_schema[a-zA-Z\._0-9]*$',
-    '^async\.*$',
-    '^agreement\.*$',
-    '^additionalProperties\.*$',
-    '^aspect\.*$',
-    '^base_ta_params[a-zA-Z\._0-9]*$',
-    '^backup_ta_params[a-zA-Z\._0-9]*$',
-    '^blank\.*$',
-    '^backup[a-zA-Z\._0-9]*$',
-    '^$before\.*$',
-    '^ecosystem.groups.unified_elements*$',
-    '^business_object_id\.*$',
-    '^backup_ta_params[a-zA-Z\._0-9]*$',
-    '^base_ta_params[a-zA-Z\._0-9]*$',
-    '^business_objects[a-zA-Z\._0-9]*$',
-    '^business_schema[a-zA-Z\._0-9]*$',
-    '^backup_placement[a-zA-Z\._0-9]*$',
-    '^business_landscape\.*$',
-    '^change-type\.*$',
-    '^changes\.*$',
-    '^consumer\.*$',
-    '^clients.validation[a-zA-Z\._0-9]*$',
-    '^components\.*$',
-    '^component\.*$',
-    '^contexts\.*$',
-    '^context*$',
-    '^tasks*$',
-    '^comments[a-zA-Z\._0-9]*$',
-    '^config[a-zA-Z\._0-9]*$',
-    '^count\.*$',
-    '^config\.*$',
-    '^clients_by_channel\.*$',
-    '^client_channels\.*$',
-    '^capacity_management[a-zA-Z\._0-9]*$',
-    '^capacity_reservation_type[a-zA-Z\._0-9]*$',
-    '^clients[a-zA-Z\._0-9]*$',
-    '^channels[a-zA-Z\._0-9]*$',
-    '^channels_by_client\.*$',
-    '^channels_by_product\.*$',
-    '^class\.*$',
-    '^criticality\.*$',
-    '^card_plain[a-zA-Z\._0-9]*$',
-    '^card[a-zA-Z\._0-9]*$',
-    '^$constructor\.*$',
-    '^config[a-zA-Z\._0-9]*$',
-    '^contains_data_objects\.*$',
-    '^description\.*$',
-    '^data_objects_contexts\.*$',
-    '^data_objects_by_integration\.*$',
-    '^data_objects_by_business\.*$',
-    '^data_map_[a-zA-Z\._0-9]*$',
-    '^domain_registry[a-zA-Z\._0-9]*$',
-    '^data_objects[a-zA-Z\._0-9]*$',
-    '^domain[a-zA-Z\._0-9]*$',
-    '^disaster_recovery[a-zA-Z\._0-9]*$',
-    '^data_context_tobe_extended[a-zA-Z\._0-9]*$',
-    '^data_context_tobe[a-zA-Z\._0-9]*$',
-    '^data_context_asis_extended[a-zA-Z\._0-9]*$',
-    '^data_context_asis[a-zA-Z\._0-9]*$',
-    '^data_context_select[a-zA-Z\._0-9]*$',
-    '^data[a-zA-Z\._0-9]*$',
-    '^dh-component-id\.*$',
-    '^\$defs*$',
-    '^dochub[a-zA-Z\._0-9]*$',
-    '^enum*$',
-    '^process_id*$',
-    '^disaster_recovery[a-zA-Z\._0-9]*$',
-    '^domains[a-zA-Z\._0-9]*$',
-    '^domain_table\.*$',
-    '^domain_registry\.*$',
-    '^dh-context-id\.*$',
-    '^dh-doc-id*$',
-    '^client_id*$',
-    '^dh-aspect-id*$',
-    '^datasets[a-zA-Z\._0-9]*$',
-    '^docs[a-zA-Z\._0-9]*$',
-    '^dh-focus-id\.*$',
-    '^entities\.*$',
-    '^extra-links\.*$',
-    '^\$error[a-zA-Z\._0-9]*$',
-    '^elk[a-zA-Z\._0-9]*$',
-    '^fetchLinks\.*$',
-    '^function_id\.*$',
-    '^functions[a-zA-Z\._0-9]*$',
-    '^function_map_[a-zA-Z\._0-9]*$',
-    '^goals\.*$',
-    '^group_context_tobe_exclude_details[a-zA-Z\._0-9]*$',
-    '^group_context_tobe[a-zA-Z\._0-9]*$',
-    '^group_context_asis_exclude_details[a-zA-Z\._0-9]*$',
-    '^group_context_asis[a-zA-Z\._0-9]*$',
-    '^group_schema[a-zA-Z\._0-9]*$',
-    '^groups[a-zA-Z\._0-9]*$',
-    '^global[a-zA-Z\._0-9]*$',
-    '^group_contexts\.*$',
-    '^goal_id\.*$',
-    '^goals[a-zA-Z\._0-9]*$',
-    '^hierarchy\.*$',
-    '^horizont\.*$',
-    '^hadr_params[a-zA-Z\._0-9]*$',
-    '^high_availability[a-zA-Z\._0-9]*$',
-    '^hooks[a-zA-Z\._0-9]*$',
-    '^header[a-zA-Z\._0-9]*$',
-    '^high_availability[a-zA-Z\._0-9]*$',
-    '^helpers[a-zA-Z\._0-9]*$',
-    '^high_availability[a-zA-Z\._0-9]*$',
-    '^headers\.*$',
-    '^imports\.*$',
-    '^integrations[a-zA-Z\._0-9]*$',
-    '^integrity[a-zA-Z\._0-9]*$',
-    '^icon\.*$',
-    '^in_systems\.*$',
-    '^integration_id\.*$',
-    '^id[a-zA-Z\._0-9]*$',
-    '^items[a-zA-Z\._0-9]*$',
-    '^integrations_by_bp\.*$',
-    '^integrations_by_data\.*$',
-    '^integrations_by_consumer\.*$',
-    '^integrations_by_src\.*$',
-    '^id\.*$',
-    '^kadzo*$',
-    '^kb_systems[a-zA-Z\._0-9]*$',
-    '^kb_system_id\.*$',
-    '^location\.*$',
-    '^load[a-zA-Z\._0-9]*$',
-    '^location[a-zA-Z\._0-9]*$',
-    '^live-stage\.*$',
-    '^live-stage-target\.*$',
-    '^target*$',
-    '^landscape*$',
-    '^validation.change-type_old*$',
-    '^validation.change-type*$',
-    '^group_id*$',
-    '^livestage*$',
-    '^grid*$',
-    '^location\.*$',
-    '^[a-zA-Z_\.]*menu{1}$',
-    '^menu[a-zA-Z\._0-9]*$',
-    '^measure\.*$',
-    '^MUE\.[a-zA-Z\._0-9]*$',
-    '^map_smartants[a-zA-Z\._0-9]*$',
-    '^monitoring[a-zA-Z\._0-9]*$',
-    '^master_system\.*$',
-    '^maximum\.*$',
-    '^MUEUsage.validation[a-zA-Z\._0-9]*$',
-    '^mm_discovery[a-zA-Z\._0-9]*$',
-    '^menu_root[a-zA-Z\._0-9]*$',
-    '^notationToTitleColor[a-zA-Z\._0-9]*$',
-    '^notationToBorderColor[a-zA-Z\._0-9]*$',
-    '^notationToColor[a-zA-Z\._0-9]*$',
-    '^nodes[a-zA-Z\._0-9]*$',
-    '^notation[a-zA-Z\._0-9]*$',
-    '^origin\.*$',
-    '^ownership[a-zA-Z\._0-9]*$',
-    '^plantuml[a-zA-Z\._0-9]*$',
-    '^overview[a-zA-Z\._0-9]*$',
-    '^objects[a-zA-Z\._0-9]*$',
-    '^$package\.*$',
-    '^params\.*$',
-    '^presentations\.*$',
-    '^patternProperties\.*$',
-    '^product_channels*$',
-    '^product_processes*$',
-    '^product_id*$',
-    '^channel_id*$',
-    '^products_by_bp\.$',
-    '^properties[a-zA-Z\._0-9]*$',
-    '^params*$',
-    '^presentations*$',
-    '^patternProperties[a-zA-Z\._0-9]*$',
-    '^placement[a-zA-Z\._0-9]*$',
-    '^products[a-zA-Z\._0-9]*$',
-    '^processes[a-zA-Z\._0-9]*$',
-    '^products_by_bp\.*$',
-    '^products_by_channel\.*$',
-    '^processes_by_integration\.*$',
-    '^processes_by_product\.*$',
-    '^processes_by_business_objects\.*$',
-    '^processes_by_system\.*$',
-    '^processes_by_integration\.*$',
-    '^processes_by_business_objects\.*$',
-    '^protected\.*$',
-    '^presentation_data_sa_config[a-zA-Z\._0-9]*$',
-    '^\$package[a-zA-Z\._0-9]*$',
-    '^props_to_summary[a-zA-Z\._0-9]*$',
-    '^parent\.*$',
-    '^registry\.*$',
-    '^rules[\.]*$',
-    '^report\.*$',
-    '^result[a-zA-Z\._0-9]*$',
-    '^rto\.*$',
-    '^rpo\.*$',
-    '^smartants\.*$',
-    '^subjects\.*$',
-    '^sber[a-zA-Z\._0-9]*$',
-    '^summary_livestage\.*$',
-    '^summary_performance\.*$',
-    '^sla\.*$',
-    '^sosna[a-zA-Z\._0-9]*$',
-    '^status\.*$',
-    '^schema_config[a-zA-Z\._0-9]*$',
-    '^settings[a-zA-Z\._0-9]*$',
-    '^style[a-zA-Z\._0-9]*$',
-    '^summary_ownership[a-zA-Z\._0-9]*$',
-    '^system[a-zA-Z\._0-9]*$',
-    '^summary_ownership[a-zA-Z\._0-9]*$',
-    '^summary_technologies\.*$',
-    '^summary_livestages\.*$',
-    '^summary_performance\.*$',
-    '^summary_performance\.*$',
-    '^software[a-zA-Z\._0-9]*$',
-    '^summary[a-zA-Z\._0-9]*$',
-    '^settings[a-zA-Z\._0-9]*$',
-    '^schemas[a-zA-Z\._0-9]*$',
-    '^sber_frame[a-zA-Z\._0-9]*$',
-    '^symbol[a-zA-Z\._0-9]*$',
-    '^strategy\.[a-zA-Z\._0-9]*$',
-    '^sec_zone[a-zA-Z\._0-9]*$',
-    '^scalability[a-zA-Z\._0-9]*$',
-    '^style[a-zA-Z\._0-9]*$',
-    '^schema\.*$',
-    '^summary\.*$',
-    '^strategy\.*$',
-    '^schema_[a-zA-Z\._0-9]*$',
-    '^smartants_arch_schemas[a-zA-Z\._0-9]*$',
-    '^security\.*$',
-    '^summary_livestage\.*$',
-    '^strategy_id\.*$',
-    '^summary_ownership\.*$',
-    '^test\.*$',
-    '^tech_services[a-zA-Z\._0-9]*$',
-    '^tech_params[a-zA-Z\._0-9]*$',
-    '^technical-use\.*$',
-    '^tech_landscape\.*$',
-    '^target-status\.*$',
-    '^to-be[a-zA-Z\._0-9]*$',
-    '^type[a-zA-Z\._0-9]*$',
-    '^tech_services[a-zA-Z\._0-9]*$',
-    '^tree\.*$',
-    '^template\.*$',
-    '^title\.$',
-    '^tech_params_by_systems[a-zA-Z\._0-9]*$',
-    '^tech_service_id[a-zA-Z\._0-9]*$',
-    '^ta_params[a-zA-Z\._0-9]*$',
-    '^v2022_migration_pack[a-zA-Z\._0-9]*$',
-    '^validators\.*$',
-    '^validation[a-zA-Z\._0-9]*$',
-    '^vendor[a-zA-Z\._0-9]*$',
-    '^version[a-zA-Z\._0-9]*$',
-    '^widgets\.*$',
-    '^wide_summary\.*$',
-    '^widgets_on_card[a-zA-Z\._0-9]*$',
-    '^uml\*$'
-];
-
-export const exclude = [
-    'patternProperties',
-    'headers',
-    'schema',
-    'functions',
-    'grid'
-];
\ No newline at end of file

From b0763fd70fe6bc710622ae3157871a04813f5376 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 16 May 2024 15:56:39 +0300
Subject: [PATCH 33/44] small fix rules model

---
 src/backend/storage/manager.mjs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 11b2102b..5a919319 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -86,6 +86,12 @@ export default {
 			}
 		}
 
+		async function loader(uri) {
+			const response = await cache.request(uri, '/');
+			return response && (typeof response.data === 'object'
+				? response.data
+				: JSON.parse(response.data));
+		}
 
 		if(app.new_rules) {
 

From 05ff08de74f8f8d90514b8cbd359c8fb5ce8a8a5 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Mon, 3 Jun 2024 19:03:46 +0300
Subject: [PATCH 34/44] small fix after review

---
 src/backend/helpers/env.mjs     |  4 +++
 src/backend/storage/manager.mjs | 54 +++++++++++++++------------------
 src/backend/utils/rules.mjs     | 12 +++++---
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/backend/helpers/env.mjs b/src/backend/helpers/env.mjs
index 9bf6ef5a..e351f10c 100644
--- a/src/backend/helpers/env.mjs
+++ b/src/backend/helpers/env.mjs
@@ -21,4 +21,8 @@ global.$listeners = {
     onFoundLoadingError: process.env.VUE_APP_DOCHUB_BACKEND_EVENT_LOADING_ERRORS_FOUND
 };
 
+global.$roles = {
+    URI: process.env.VUE_APP_DOCHUB_ROLES
+}
+
 export default dotenv;
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 5a919319..0bcb3e37 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -6,11 +6,10 @@ import events from '../helpers/events.mjs';
 import validators from '../helpers/validators.mjs';
 import entities from '../entities/entities.mjs';
 import objectHash from 'object-hash';
-import lodash from 'lodash';
+import '../helpers/env.mjs';
 
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import jsonataFunctions from '../../global/jsonata/functions.mjs';
-import path from "path";
 
 const LOG_TAG = 'storage-manager';
 
@@ -98,14 +97,14 @@ export default {
 			let mergeRules = [];
 			const ids = [];
 
-			let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-
-			const dirname = path.dirname(uri);
-			const defaultRoles = await loader(`${dirname}/default.yaml`);
+			const {URI} =  global.$roles;
+			const url = new URL(URI);
+			const defaultUrl = new URL( 'default.yaml', URI);
+			const defaultRoles = await loader(defaultUrl);
 			const systemRules = defaultRoles?.roles;
 			const exclude = defaultRoles?.exclude;
 
-			const manifest = await loader(uri);
+			const manifest = await loader(url);
 
 			for(let rule in app.new_rules) {
 				for(let nRule in manifest?.roles) {
@@ -117,7 +116,7 @@ export default {
 			}
 
 			const id = ids.sort((a,b) => {return a.localeCompare(b);}).join('');
-			let rawManifest = lodash.cloneDeep(app.storage.manifests.origin);
+			let rawManifest = JSON.parse(JSON.stringify(app.storage.manifests.origin));
 			cleanData(rawManifest, systemRules.concat(mergeRules), exclude);
 			app.storage.manifests[id] = rawManifest;
 		}
@@ -128,7 +127,7 @@ export default {
 		logger.log('Run full reload manifest', LOG_TAG);
 		// Загрузку начинаем с виртуального манифеста
 		cache.errorClear();
-		let localStorage = {};
+		let storageManifest = {};
 		let createManifest = async function() {
 			await manifestParser.clean();
 			await manifestParser.startLoad();
@@ -140,9 +139,9 @@ export default {
 
 		let matchRegex = (string, filters) => {
 
-			var len = filters.length, i = 0;
+			const len = filters.length;
 
-			for (; i < len; i++) {
+			for (let i = 0; i < len; i++) {
 				if (string.match(filters[i])) {
 					return true;
 				}
@@ -151,9 +150,9 @@ export default {
 		};
 
 		let matchExclude = (string, exclude) => {
-			var len = exclude.length, i = 0;
+			const len = exclude.length;
 
-			for (; i < len; i++) {
+			for (let i = 0; i < len; i++) {
 				if (string === exclude[i]) {
 					return true;
 				}
@@ -186,44 +185,41 @@ export default {
 
 		let createRoleManifest = async function () {
 			try {
-				let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-
-				const dirname = path.dirname(uri);
-				const defaultRoles = await loader(`${dirname}/default.yaml`);
+				const {URI} =  global.$roles;
+				const url = new URL(URI);
+				const defaultUrl = new URL( 'default.yaml', URI);
+				const defaultRoles = await loader(defaultUrl);
 				const systemRules = defaultRoles?.roles;
 				const exclude = defaultRoles?.exclude;
 
-				const manifest = await loader(uri);
+				const manifest = await loader(url);
 
 
 				for (const key in manifest?.roles) {
-					let rawManifest = lodash.cloneDeep(localStorage.manifests.origin);
+					let rawManifest = JSON.parse(JSON.stringify(storageManifest.manifests.origin));
 					cleanData(rawManifest, systemRules.concat(manifest?.roles[key]), exclude);
-					localStorage.manifests[key] = rawManifest;
+					storageManifest.manifests[key] = rawManifest;
 				}
-
-
-
 			} catch (e) {
 				this.registerError(e, e.uri || uri);
 			}
 		}
 
 		await createManifest();
-		localStorage.manifests = {origin: manifestParser.manifest};
+		storageManifest.manifests = {origin: manifestParser.manifest};
 		await createRoleManifest();
 
-		console.log('manifestParser.manifest', localStorage.manifests.origin);
+		console.log('manifestParser.manifest', storageManifest.manifests.origin);
 
-		entities(localStorage.manifests['default']);
+		entities(storageManifest.manifests['default']);
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {
-			manifest: localStorage.manifests['default'],			// Сформированный манифест
-			hash: objectHash(localStorage.manifests['default']),	// HASH состояния для контроля в кластере
+			manifest: storageManifest.manifests['default'],			// Сформированный манифест
+			hash: objectHash(storageManifest.manifests['default']),	// HASH состояния для контроля в кластере
 			mergeMap: {},								// Карта склейки объектов
 			md5Map: {}, 								// Карта путей к ресурсам по md5 пути
-			manifests: {...localStorage.manifests},
+			manifests: {...storageManifest.manifests},
 			roleId: 'default',
 			// Ошибки, которые возникли при загрузке манифестов
 			// по умолчанию заполняем ошибками, которые возникли при загрузке
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
index 2c237870..8635b5f7 100644
--- a/src/backend/utils/rules.mjs
+++ b/src/backend/utils/rules.mjs
@@ -1,12 +1,14 @@
 import cache from "../storage/cache.mjs";
+import path from "path";
 
 export async function getCurrentRuleId(rules) {
     if(rules.length === 0) return 'default';
 
     const ids = [];
 
-    let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-    const response = await cache.request(uri, '/');
+    const {URI} =  global.$roles;
+    const url = new URL(URI);
+    const response = await cache.request(url, '/');
 
     const manifest = response && (typeof response.data === 'object'
         ? response.data
@@ -28,9 +30,9 @@ export async function getCurrentRules(rules) {
     if(rules.length === 0) return [];
 
     const result = [];
-
-    let uri = `${process.env.VUE_APP_DOCHUB_ROLES}`;
-    const response = await cache.request(uri, '/');
+    const {URI} =  global.$roles;
+    const url = new URL(URI);
+    const response = await cache.request(url, '/');
 
     const manifest = response && (typeof response.data === 'object'
         ? response.data

From 9facda78fda473103c20947c15e8d9e303714a73 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 4 Jun 2024 13:47:51 +0300
Subject: [PATCH 35/44] role model update

---
 src/backend/storage/manager.mjs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 0bcb3e37..8aaaa323 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -167,7 +167,7 @@ export default {
 				: JSON.parse(response.data));
 		}
 
-		function cleanData(manifest, filters, exclude) {
+		function makeData(manifest, filters, exclude) {
 			if (typeof manifest != "object") return;
 			if (!manifest) return;
 
@@ -181,24 +181,30 @@ export default {
 					delete manifest[key];
 				}
 			}
+			return {}
 		}
 
 		let createRoleManifest = async function () {
 			try {
+				// загружаю основной файл с ролями
 				const {URI} =  global.$roles;
 				const url = new URL(URI);
-				const defaultUrl = new URL( 'default.yaml', URI);
+				const manifest = await loader(url);
+				// загружаю правила по умолчанию
+				const defaultUrl = new URL('default.yaml', URI);
 				const defaultRoles = await loader(defaultUrl);
 				const systemRules = defaultRoles?.roles;
 				const exclude = defaultRoles?.exclude;
 
-				const manifest = await loader(url);
+
+
 
 
 				for (const key in manifest?.roles) {
-					let rawManifest = JSON.parse(JSON.stringify(storageManifest.manifests.origin));
-					cleanData(rawManifest, systemRules.concat(manifest?.roles[key]), exclude);
-					storageManifest.manifests[key] = rawManifest;
+					const subset = Object.keys(storageManifest.manifests.origin)
+						.filter(key => ['baz', 'qux'].indexOf(key) < 0)
+						.reduce((obj2, key) => (obj2[key] = obj[key], obj2), {});
+					storageManifest.manifests[key] = makeData(storageManifest.manifests.origin, systemRules.concat(manifest?.roles[key]), exclude);
 				}
 			} catch (e) {
 				this.registerError(e, e.uri || uri);
@@ -207,6 +213,7 @@ export default {
 
 		await createManifest();
 		storageManifest.manifests = {origin: manifestParser.manifest};
+		Object.freeze(storageManifest.manifests.origin);
 		await createRoleManifest();
 
 		console.log('manifestParser.manifest', storageManifest.manifests.origin);

From f42c38bef13cd856763f9a2d4706b85457ef1e5f Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 4 Jun 2024 18:51:45 +0300
Subject: [PATCH 36/44] role model update

---
 src/backend/storage/manager.mjs | 68 +++++++++++++--------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 8aaaa323..19dfcc04 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -69,22 +69,6 @@ export default {
 			return false;
 		}
 
-		function cleanData(manifest, filters, exclude) {
-			if (typeof manifest != "object") return;
-			if (!manifest) return;
-
-			for (const key in manifest) {
-				if(matchExclude(key, exclude) || typeof manifest[key] != 'object')
-					continue;
-
-				if(matchRegex(key, filters))  {
-					cleanData(manifest[key], filters, exclude);
-				} else {
-					delete manifest[key];
-				}
-			}
-		}
-
 		async function loader(uri) {
 			const response = await cache.request(uri, '/');
 			return response && (typeof response.data === 'object'
@@ -116,9 +100,19 @@ export default {
 			}
 
 			const id = ids.sort((a,b) => {return a.localeCompare(b);}).join('');
-			let rawManifest = JSON.parse(JSON.stringify(app.storage.manifests.origin));
-			cleanData(rawManifest, systemRules.concat(mergeRules), exclude);
-			app.storage.manifests[id] = rawManifest;
+
+			const filters = systemRules.concat(mergeRules);
+			const newManifest = (obj)=> Object.entries(obj)
+				.filter(([key, value]) => matchExclude(key, exclude) || matchRegex(key, filters))
+				.reduce((acc, [key, value]) => {
+					if(value != null && typeof value === 'object') {
+						acc[key] = newManifest(value);
+						return acc;
+					}
+					return ({...acc, [key]: obj[key]});
+				}, {});
+
+			app.storage.manifests[id] = newManifest(app.storage.manifests.origin);
 		}
 	},
 	reloadManifest: async function(app) {
@@ -167,23 +161,6 @@ export default {
 				: JSON.parse(response.data));
 		}
 
-		function makeData(manifest, filters, exclude) {
-			if (typeof manifest != "object") return;
-			if (!manifest) return;
-
-			for (const key in manifest) {
-				if(matchExclude(key, exclude) || typeof manifest[key] != 'object')
-					continue;
-
-				if(matchRegex(key, filters))  {
-					cleanData(manifest[key], filters, exclude);
-				} else {
-					delete manifest[key];
-				}
-			}
-			return {}
-		}
-
 		let createRoleManifest = async function () {
 			try {
 				// загружаю основной файл с ролями
@@ -197,14 +174,21 @@ export default {
 				const exclude = defaultRoles?.exclude;
 
 
+				//Object.entries(storageManifest.manifests.origin).filter(([key, value]) => key !== 'config').reduce((acc, [key]) => ({...acc, [key]: storageManifest.manifests.origin[key]}), {})
 
 
-
-				for (const key in manifest?.roles) {
-					const subset = Object.keys(storageManifest.manifests.origin)
-						.filter(key => ['baz', 'qux'].indexOf(key) < 0)
-						.reduce((obj2, key) => (obj2[key] = obj[key], obj2), {});
-					storageManifest.manifests[key] = makeData(storageManifest.manifests.origin, systemRules.concat(manifest?.roles[key]), exclude);
+				for (const role in manifest?.roles) {
+					const filters = systemRules.concat(manifest?.roles[role]);
+					const newManifest = (obj)=> Object.entries(obj)
+						.filter(([key, value]) => matchExclude(key, exclude) || matchRegex(key, filters))
+						.reduce((acc, [key, value]) => {
+							if(value != null && typeof value === 'object') {
+								acc[key] = newManifest(value);
+								return acc;
+							}
+							return ({...acc, [key]: obj[key]});
+						}, {});
+					storageManifest.manifests[role] = newManifest(storageManifest.manifests.origin);
 				}
 			} catch (e) {
 				this.registerError(e, e.uri || uri);

From e7afc950cfbad4195fbff9e8a1f6c6058405ea34 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Wed, 5 Jun 2024 18:04:26 +0300
Subject: [PATCH 37/44] role model small fix

---
 src/backend/storage/manager.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 19dfcc04..a03ca802 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -180,7 +180,7 @@ export default {
 				for (const role in manifest?.roles) {
 					const filters = systemRules.concat(manifest?.roles[role]);
 					const newManifest = (obj)=> Object.entries(obj)
-						.filter(([key, value]) => matchExclude(key, exclude) || matchRegex(key, filters))
+						.filter(([key, value]) => (typeof value != 'object' || Array.isArray(value) || matchExclude(key, exclude)) || matchRegex(key, filters))
 						.reduce((acc, [key, value]) => {
 							if(value != null && typeof value === 'object') {
 								acc[key] = newManifest(value);

From 3f329bafdcc70149f2bdc8c72560b27536b96d88 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 6 Jun 2024 11:03:13 +0300
Subject: [PATCH 38/44] role model small fix

---
 src/backend/storage/manager.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index a03ca802..b6ffd080 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -182,11 +182,11 @@ export default {
 					const newManifest = (obj)=> Object.entries(obj)
 						.filter(([key, value]) => (typeof value != 'object' || Array.isArray(value) || matchExclude(key, exclude)) || matchRegex(key, filters))
 						.reduce((acc, [key, value]) => {
-							if(value != null && typeof value === 'object') {
+							if(value != null && typeof value === 'object' && !Array.isArray(value)) {
 								acc[key] = newManifest(value);
 								return acc;
 							}
-							return ({...acc, [key]: obj[key]});
+							return Array.isArray(obj) ?  [...acc, ...obj] : ({...acc, [key]: obj[key]});
 						}, {});
 					storageManifest.manifests[role] = newManifest(storageManifest.manifests.origin);
 				}

From 54c89c6a132011df0320a4316749744a7ffaf0a9 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 6 Jun 2024 12:12:13 +0300
Subject: [PATCH 39/44] role model small fix

---
 src/backend/storage/manager.mjs | 91 ++-------------------------------
 src/backend/utils/rules.mjs     | 43 +++++++++++++++-
 2 files changed, 45 insertions(+), 89 deletions(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index b6ffd080..4600de7f 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -10,6 +10,7 @@ import '../helpers/env.mjs';
 
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import jsonataFunctions from '../../global/jsonata/functions.mjs';
+import {newManifest, loader} from "../utils/rules.mjs";
 
 const LOG_TAG = 'storage-manager';
 
@@ -46,36 +47,6 @@ export default {
 	// Стек обработчиков события на обновление манифеста
 	onApplyManifest: [],
 	createNewManifest: async function(app) {
-		let matchRegex = (string, filters) => {
-
-			var len = filters.length, i = 0;
-
-			for (; i < len; i++) {
-				if (string.match(filters[i])) {
-					return true;
-				}
-			}
-			return false;
-		};
-
-		let matchExclude = (string, exclude) => {
-			var len = exclude.length, i = 0;
-
-			for (; i < len; i++) {
-				if (string === exclude[i]) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		async function loader(uri) {
-			const response = await cache.request(uri, '/');
-			return response && (typeof response.data === 'object'
-				? response.data
-				: JSON.parse(response.data));
-		}
-
 		if(app.new_rules) {
 
 			let mergeRules = [];
@@ -102,22 +73,11 @@ export default {
 			const id = ids.sort((a,b) => {return a.localeCompare(b);}).join('');
 
 			const filters = systemRules.concat(mergeRules);
-			const newManifest = (obj)=> Object.entries(obj)
-				.filter(([key, value]) => matchExclude(key, exclude) || matchRegex(key, filters))
-				.reduce((acc, [key, value]) => {
-					if(value != null && typeof value === 'object') {
-						acc[key] = newManifest(value);
-						return acc;
-					}
-					return ({...acc, [key]: obj[key]});
-				}, {});
-
-			app.storage.manifests[id] = newManifest(app.storage.manifests.origin);
+			app.storage.manifests[id] = newManifest(app.storage.manifests.origin, exclude, filters);
 		}
 	},
 	reloadManifest: async function(app) {
 
-		console.log('reloadManifest');
 		logger.log('Run full reload manifest', LOG_TAG);
 		// Загрузку начинаем с виртуального манифеста
 		cache.errorClear();
@@ -131,36 +91,6 @@ export default {
 			await manifestParser.stopLoad();
 		};
 
-		let matchRegex = (string, filters) => {
-
-			const len = filters.length;
-
-			for (let i = 0; i < len; i++) {
-				if (string.match(filters[i])) {
-					return true;
-				}
-			}
-			return false;
-		};
-
-		let matchExclude = (string, exclude) => {
-			const len = exclude.length;
-
-			for (let i = 0; i < len; i++) {
-				if (string === exclude[i]) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		async function loader(uri) {
-			const response = await cache.request(uri, '/');
-			return response && (typeof response.data === 'object'
-				? response.data
-				: JSON.parse(response.data));
-		}
-
 		let createRoleManifest = async function () {
 			try {
 				// загружаю основной файл с ролями
@@ -173,22 +103,9 @@ export default {
 				const systemRules = defaultRoles?.roles;
 				const exclude = defaultRoles?.exclude;
 
-
-				//Object.entries(storageManifest.manifests.origin).filter(([key, value]) => key !== 'config').reduce((acc, [key]) => ({...acc, [key]: storageManifest.manifests.origin[key]}), {})
-
-
 				for (const role in manifest?.roles) {
 					const filters = systemRules.concat(manifest?.roles[role]);
-					const newManifest = (obj)=> Object.entries(obj)
-						.filter(([key, value]) => (typeof value != 'object' || Array.isArray(value) || matchExclude(key, exclude)) || matchRegex(key, filters))
-						.reduce((acc, [key, value]) => {
-							if(value != null && typeof value === 'object' && !Array.isArray(value)) {
-								acc[key] = newManifest(value);
-								return acc;
-							}
-							return Array.isArray(obj) ?  [...acc, ...obj] : ({...acc, [key]: obj[key]});
-						}, {});
-					storageManifest.manifests[role] = newManifest(storageManifest.manifests.origin);
+					storageManifest.manifests[role] = newManifest(storageManifest.manifests.origin, exclude, filters);
 				}
 			} catch (e) {
 				this.registerError(e, e.uri || uri);
@@ -200,8 +117,6 @@ export default {
 		Object.freeze(storageManifest.manifests.origin);
 		await createRoleManifest();
 
-		console.log('manifestParser.manifest', storageManifest.manifests.origin);
-
 		entities(storageManifest.manifests['default']);
 
 		logger.log('Full reload is done', LOG_TAG);
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
index 8635b5f7..1ddf73b1 100644
--- a/src/backend/utils/rules.mjs
+++ b/src/backend/utils/rules.mjs
@@ -1,5 +1,4 @@
 import cache from "../storage/cache.mjs";
-import path from "path";
 
 export async function getCurrentRuleId(rules) {
     if(rules.length === 0) return 'default';
@@ -48,4 +47,46 @@ export async function getCurrentRules(rules) {
     return result;
 }
 
+export const newManifest = (obj, exclude, filters)=> Object.entries(obj)
+    .filter(([key, value]) => (typeof value != 'object' || Array.isArray(value) || matchExclude(key, exclude)) || matchRegex(key, filters))
+    .reduce((acc, [key, value]) => {
+        if(value != null && typeof value === 'object' && !Array.isArray(value)) {
+            acc[key] = newManifest(value, exclude, filters);
+            return acc;
+        }
+        return Array.isArray(obj) ?  [...acc, ...obj] : ({...acc, [key]: obj[key]});
+    }, {});
+
+export async function loader(uri) {
+    const response = await cache.request(uri, '/');
+    return response && (typeof response.data === 'object'
+        ? response.data
+        : JSON.parse(response.data));
+}
+
+function matchRegex(string, filters){
+
+    const len = filters.length;
+
+    for (let i = 0; i < len; i++) {
+        if (string.match(filters[i])) {
+            return true;
+        }
+    }
+    return false;
+};
+
+function matchExclude(string, exclude) {
+    const len = exclude.length;
+
+    for (let i = 0; i < len; i++) {
+        if (string === exclude[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
 

From d0a547fcd53c9e9567b831a4ae21422ab264eae3 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 6 Jun 2024 12:14:38 +0300
Subject: [PATCH 40/44] remove console.log

---
 src/backend/storage/manager.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 4600de7f..74aebd76 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -154,7 +154,6 @@ export default {
 		Object.freeze(app.storage);
 		this.resetCustomFunctions(storage.manifest);
 		this.onApplyManifest.map((listener) => listener(app));
-		console.log('applyManifest');
 	},
 	cleanStorage(app) {
 		this.cacheFunction = null;

From dcfbc8698a081cf0eec5ac0b1e40af58e8e9baa8 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 11 Jun 2024 16:17:08 +0300
Subject: [PATCH 41/44] adaptation role model

---
 src/backend/controllers/core.mjs | 78 ++++++++++++++++++++++----------
 src/backend/helpers/datasets.mjs | 12 ++++-
 src/backend/helpers/env.mjs      |  1 +
 src/backend/storage/manager.mjs  | 22 +++++----
 src/backend/utils/rules.mjs      |  7 +++
 5 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/src/backend/controllers/core.mjs b/src/backend/controllers/core.mjs
index 999f7a17..bdf74c1d 100644
--- a/src/backend/controllers/core.mjs
+++ b/src/backend/controllers/core.mjs
@@ -5,7 +5,7 @@ import queries from '../../global/jsonata/queries.mjs';
 import helpers from './helpers.mjs';
 import compression from '../../global/compress/compress.mjs';
 import {getRoles} from '../helpers/jwt.mjs';
-import {getCurrentRuleId, getCurrentRules} from "../utils/rules.mjs";
+import {DEFAULT_ROLE, getCurrentRuleId, getCurrentRules, isRolesMode} from "../utils/rules.mjs";
 
 const compressor = compression();
 
@@ -14,10 +14,21 @@ export default (app) => {
 
     // Создает ответ на JSONata запрос и при необходимости кэширует ответ
     function makeJSONataQueryResponse(res, query, params, subject, ruleId) {
-        cache.pullFromCache(app.storage.hash, JSON.stringify({ query, params, subject, ruleId }), async() => {
-            let ctx = ruleId === '' ? app.storage.manifests['default'] : app.storage.manifests[ruleId];
+        let key;
+        if(isRolesMode()) {
+            key = { query, params, subject, ruleId };
+        } else {
+            key = { query, params, subject};
+        }
+        cache.pullFromCache(app.storage.hash, JSON.stringify(key), async() => {
+            let context;
+            if(isRolesMode()) {
+                context = ruleId === '' ? app.storage.manifests[DEFAULT_ROLE] : app.storage.manifests[ruleId];
+            } else {
+                context =  app.storage.manifest;
+            }
             return await datasets(app).parseSource(
-                ctx,
+                context,
                 query,
                 subject,
                 params
@@ -48,11 +59,13 @@ export default (app) => {
     app.get('/core/storage/jsonata/:query', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
-        const roles = getRoles(req.headers);
-        const id = await getCurrentRuleId(roles);
-        const currentRules = await getCurrentRules(roles);
-        app.storage = {...app.storage, roles: [...currentRules],roleId: id};
-
+        let id;
+        if(isRolesMode()) {
+            const roles = getRoles(req.headers);
+            id = await getCurrentRuleId(roles);
+            const currentRules = await getCurrentRules(roles);
+            app.storage = {...app.storage, roles: [...currentRules], roleId: id};
+        }
         const request = parseRequest(req);
         const query = (request.query.length === 36) && queries.QUERIES[request.query]
             ? `(${queries.makeQuery(queries.QUERIES[request.query], request.params)})`
@@ -70,7 +83,9 @@ export default (app) => {
             });
             return;
         } else {
-            app.storage = {...app.storage, manifests: null}
+            if(isRolesMode()) {
+                app.storage = {...app.storage, manifests: null}
+            }
             const oldHash = app.storage.hash;
             storeManager.reloadManifest(app)
                 .then((storage) => storeManager.applyManifest(app, storage))
@@ -83,17 +98,28 @@ export default (app) => {
     app.get('/core/storage/release-data-profile/:query', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
-        const roles = getRoles(req.headers);
-        const id = await getCurrentRuleId(roles);
-        const currentRules = await getCurrentRules(roles);
-        app.storage = {...app.storage, roles: [...currentRules], roleId: id};
+        const request = parseRequest(req);
+
+        let storageManifest = app.storage.manifest;
+        let key = {
+            path: request.query,
+            params: request.params
+        };
 
-            const request = parseRequest(req);
-            cache.pullFromCache(app.storage.hash, JSON.stringify({
+        if(isRolesMode()) {
+            const roles = getRoles(req.headers);
+            const id = await getCurrentRuleId(roles);
+            const currentRules = await getCurrentRules(roles);
+            app.storage = {...app.storage, roles: [...currentRules], roleId: id};
+            storageManifest = app.storage.manifests[id];
+            key ={
                 path: request.query,
                 params: request.params,
                 roles: id
-            }), async () => {
+            };
+        }
+
+        cache.pullFromCache(app.storage.hash, JSON.stringify(key), async () => {
                 if (request.query.startsWith('/'))
                     return await datasets(app).releaseData(request.query, request.params);
                 else {
@@ -115,7 +141,7 @@ export default (app) => {
                         }
                         return await ds.getData(path.context, profile, params, path.baseURI);
                     } else {
-                        return await ds.getData(app.storage.manifests[id], profile, params);
+                        return await ds.getData(storageManifest, profile, params);
                     }
                 }
             }, res);
@@ -125,14 +151,16 @@ export default (app) => {
     app.get('/core/storage/problems/', async function(req, res) {
         if (!helpers.isServiceReady(app, res)) return;
 
-        const roles = getRoles(req.headers);
-        const currentRules = await getCurrentRules(roles);
-        const id = await getCurrentRuleId(roles);
-        app.storage = {...app.storage, roles: [...currentRules], roleId: id};
+        if(isRolesMode()) {
+            const roles = getRoles(req.headers);
+            const currentRules = await getCurrentRules(roles);
+            const id = await getCurrentRuleId(roles);
+            app.storage = {...app.storage, roles: [...currentRules], roleId: id};
 
-        if(!checkRulesManifest(id)) {
-            app.new_rules = currentRules;
-            await storeManager.createNewManifest(app);
+            if (!checkRulesManifest(id)) {
+                app.new_rules = currentRules;
+                await storeManager.createNewManifest(app);
+            }
         }
         res.json(app.storage.problems || []);
     });
diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index 7840c4e9..cd1bd177 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -3,12 +3,20 @@ import jsonataDriver from '../../global/jsonata/driver.mjs';
 import datasetDriver from '../../global/datasets/driver.mjs';
 import pathTool from '../../global/manifest/tools/path.mjs';
 import entities from '../entities/entities.mjs';
+import {isRolesMode, DEFAULT_ROLE} from "../utils/rules.mjs";
 import md5 from 'md5';
 
 export default function(app) {
 
-	let currentContext = app.storage.roleId === 'default' ? app.storage.manifests['default'] : app.storage.manifests[app.storage.roleId];
-	entities(currentContext);
+	let currentContext;
+
+	if(isRolesMode()) {
+		let currentContext = app.storage.roleId === DEFAULT_ROLE ? app.storage.manifests[DEFAULT_ROLE] : app.storage.manifests[app.storage.roleId];
+		entities(currentContext);
+	} else {
+		currentContext = app.storage.manifest;
+	}
+
 	const result = Object.assign({}, datasetDriver,
 		{
 			// Возвращаем метаданных об объекте
diff --git a/src/backend/helpers/env.mjs b/src/backend/helpers/env.mjs
index e351f10c..a905a4c8 100644
--- a/src/backend/helpers/env.mjs
+++ b/src/backend/helpers/env.mjs
@@ -22,6 +22,7 @@ global.$listeners = {
 };
 
 global.$roles = {
+    MODE: process.env.VUE_APP_DOCHUB_ROLES_MODEL,
     URI: process.env.VUE_APP_DOCHUB_ROLES
 }
 
diff --git a/src/backend/storage/manager.mjs b/src/backend/storage/manager.mjs
index 74aebd76..0cd6f0d4 100644
--- a/src/backend/storage/manager.mjs
+++ b/src/backend/storage/manager.mjs
@@ -10,7 +10,7 @@ import '../helpers/env.mjs';
 
 import jsonataDriver from '../../global/jsonata/driver.mjs';
 import jsonataFunctions from '../../global/jsonata/functions.mjs';
-import {newManifest, loader} from "../utils/rules.mjs";
+import {newManifest, loader, isRolesMode, DEFAULT_ROLE} from "../utils/rules.mjs";
 
 const LOG_TAG = 'storage-manager';
 
@@ -113,20 +113,26 @@ export default {
 		}
 
 		await createManifest();
-		storageManifest.manifests = {origin: manifestParser.manifest};
-		Object.freeze(storageManifest.manifests.origin);
-		await createRoleManifest();
 
-		entities(storageManifest.manifests['default']);
+		let baseManifest = manifestParser.manifest;
+
+		if(isRolesMode()) {
+			storageManifest.manifests = {origin: baseManifest};
+			Object.freeze(storageManifest.manifests.origin);
+			await createRoleManifest();
+			baseManifest = storageManifest.manifests[DEFAULT_ROLE];
+		}
+
+		entities(baseManifest);
 
 		logger.log('Full reload is done', LOG_TAG);
 		const result = {
-			manifest: storageManifest.manifests['default'],			// Сформированный манифест
-			hash: objectHash(storageManifest.manifests['default']),	// HASH состояния для контроля в кластере
+			manifest: baseManifest, // Сформированный манифест
+			hash: objectHash(baseManifest), // HASH состояния для контроля в кластере
 			mergeMap: {},								// Карта склейки объектов
 			md5Map: {}, 								// Карта путей к ресурсам по md5 пути
 			manifests: {...storageManifest.manifests},
-			roleId: 'default',
+			roleId: DEFAULT_ROLE,
 			// Ошибки, которые возникли при загрузке манифестов
 			// по умолчанию заполняем ошибками, которые возникли при загрузке
 			problems: Object.keys(cache.errors || {}).map((key) => cache.errors[key]) || []
diff --git a/src/backend/utils/rules.mjs b/src/backend/utils/rules.mjs
index 1ddf73b1..4d9106d2 100644
--- a/src/backend/utils/rules.mjs
+++ b/src/backend/utils/rules.mjs
@@ -1,5 +1,7 @@
 import cache from "../storage/cache.mjs";
 
+export const DEFAULT_ROLE = 'default';
+
 export async function getCurrentRuleId(rules) {
     if(rules.length === 0) return 'default';
 
@@ -64,6 +66,11 @@ export async function loader(uri) {
         : JSON.parse(response.data));
 }
 
+export function isRolesMode() {
+    const {MODE} =  global.$roles;
+    return (MODE || 'N').toUpperCase() === 'Y';
+}
+
 function matchRegex(string, filters){
 
     const len = filters.length;

From 8d9a59c0abd47e67e3f634280cf643c028d04cb3 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Tue, 11 Jun 2024 16:45:40 +0300
Subject: [PATCH 42/44] adaptation role model

---
 src/backend/helpers/validators.mjs         | 8 ++++++--
 src/frontend/components/Layouts/Header.vue | 5 ++++-
 src/frontend/helpers/env.ts                | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/backend/helpers/validators.mjs b/src/backend/helpers/validators.mjs
index c52cb508..d130cff9 100644
--- a/src/backend/helpers/validators.mjs
+++ b/src/backend/helpers/validators.mjs
@@ -1,6 +1,7 @@
 import validators from '../../global/rules/validators.mjs';
 import datasets from './datasets.mjs';
 import logger from '../utils/logger.mjs';
+import {isRolesMode} from "../utils/rules.mjs";
 
 const LOG_TAG = 'validators';
 
@@ -12,8 +13,11 @@ export default function(app) {
 	};
 	logger.log('Executing validators..', LOG_TAG);
 
-	validators(datasets(app), app.storage.manifests[app.storage.roleId], pushValidator, pushValidator);
-
+	let storageManifest = app.storage.manifest;
+	if(isRolesMode()) {
+		storageManifest = app.storage.manifests[app.storage.roleId];
+	}
+	validators(datasets(app), storageManifest, pushValidator, pushValidator);
 	logger.log('Done.', LOG_TAG);
 
 }
diff --git a/src/frontend/components/Layouts/Header.vue b/src/frontend/components/Layouts/Header.vue
index a7f49bf2..214d89c9 100644
--- a/src/frontend/components/Layouts/Header.vue
+++ b/src/frontend/components/Layouts/Header.vue
@@ -23,7 +23,7 @@
       <v-icon>refresh</v-icon>
     </v-btn>
       </div>
-      <div class="main-layout__header__menu">
+      <div v-if="isRolesMode" class="main-layout__header__menu">
         <v-toolbar-title right offset-y style="cursor: pointer" v-on:click="loginout()">{{
             user || 'Login'
           }}
@@ -74,6 +74,9 @@
       };
     },
     computed: {
+      isRolesMode() {
+        return env.isRolesMode();
+      },
       gotoIconShow() {
         return env.isPlugin() && this.$route.name === 'entities';
       },
diff --git a/src/frontend/helpers/env.ts b/src/frontend/helpers/env.ts
index caa3b7d2..fc688a82 100644
--- a/src/frontend/helpers/env.ts
+++ b/src/frontend/helpers/env.ts
@@ -48,6 +48,9 @@ export default {
   isBackendMode() {
     return !this.isPlugin() && (process.env.VUE_APP_DOCHUB_BACKEND_URL || ((process.env.VUE_APP_DOCHUB_MODE || '').toLowerCase() === 'backend'));
   },
+  isRolesMode(): boolean {
+    return (process.env.VUE_APP_DOCHUB_ROLES_MODEL || 'N').toUpperCase() === 'Y';
+  },
   isProduction(): boolean {
     return this.dochub.NODE_ENV === 'production';
   },

From f44841b2d92b554bcda76fdc545edb704bbe670e Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Thu, 13 Jun 2024 09:22:25 +0300
Subject: [PATCH 43/44] adaptation role model fix

---
 src/backend/helpers/datasets.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/helpers/datasets.mjs b/src/backend/helpers/datasets.mjs
index cd1bd177..16f72736 100644
--- a/src/backend/helpers/datasets.mjs
+++ b/src/backend/helpers/datasets.mjs
@@ -11,7 +11,7 @@ export default function(app) {
 	let currentContext;
 
 	if(isRolesMode()) {
-		let currentContext = app.storage.roleId === DEFAULT_ROLE ? app.storage.manifests[DEFAULT_ROLE] : app.storage.manifests[app.storage.roleId];
+		currentContext = app.storage.roleId === DEFAULT_ROLE ? app.storage.manifests[DEFAULT_ROLE] : app.storage.manifests[app.storage.roleId];
 		entities(currentContext);
 	} else {
 		currentContext = app.storage.manifest;

From c9270c50c4e305431fb6b29ad74c3ed477119e12 Mon Sep 17 00:00:00 2001
From: Nikolay Temnyakov <temnjakovn@gmail.com>
Date: Mon, 17 Jun 2024 15:40:02 +0300
Subject: [PATCH 44/44] role model fix docs

---
 example.env                                        | 2 ++
 public/documentation/docs/manual/entities/rules.md | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/example.env b/example.env
index 301b57bf..84f37c3f 100644
--- a/example.env
+++ b/example.env
@@ -157,6 +157,8 @@
 #                   Пример конфигурирования ролевой модели
 # ***********************************************************
 # (B) Режим backend
+# Если "y", то включается режим работы с ролевой модель.
+# VUE_APP_DOCHUB_ROLES_MODEL= y / n
 # Указываем путь до манифеста с описанием ролей
 # Пример описания:
 # roles:
diff --git a/public/documentation/docs/manual/entities/rules.md b/public/documentation/docs/manual/entities/rules.md
index 0b40c64a..c6b62910 100644
--- a/public/documentation/docs/manual/entities/rules.md
+++ b/public/documentation/docs/manual/entities/rules.md
@@ -3,6 +3,9 @@
 Ролевая модель - позволяет разграничивать доступы к элементам архитектуры. 
 Управление ролями пользователей происходит на стороне keycloack.
 
+Для включения работы с ролевой моделью требуется установить следующий флаг:
+VUE_APP_DOCHUB_ROLES_MODEL=y
+
 Описание ролей осуществляется в корневом файле roles.yaml
 Пример описания правил доступа:
 ```