imp: support odoo 18.0

Tardo · Oct 21, 2024 · 5b9b195 · 5b9b195
1 parent 33557d0
commit 5b9b195
Show file tree

Hide file tree

Showing 35 changed files with 169 additions and 88 deletions.
diff --git a/src/js/flow-typed/odoo.js b/src/js/flow-typed/odoo.js
@@ -16,6 +16,7 @@ declare type OdooSession = {
   storeData: Object,
   [string]: number | string,
 };
+declare type OdooSessionInfo = Object;
 declare type OdooLongpollingItem = [string, string] | {...};
 declare type OdooSearchResponse = Object;
 

diff --git a/src/js/page/loader.mjs b/src/js/page/loader.mjs
@@ -15,8 +15,8 @@ import registerCommonFuncs from '@odoo/commands/common/__all__';
 import OdooTerminal from '@odoo/terminal';
 import getOdooVersion from '@odoo/utils/get_odoo_version';
 import getOdooService from '@odoo/utils/get_odoo_service';
-import getUID from '@odoo/utils/get_uid';
-import getUsername from '@odoo/utils/get_username';
+import getUID from '@odoo/net_utils/get_uid';
+import getUsername from '@odoo/net_utils/get_username';
 import isBackOffice from '@odoo/utils/is_backoffice';
 import registerMathFuncs from '@trash/libs/math/__all__';
 import registerTimeFuncs from '@trash/libs/time/__all__';
@@ -63,7 +63,7 @@ async function postInitTerminal(term_obj: OdooTerminal, config: TerminalOptions)
     version: odoo_ver,
   };
   const username = await getUsername(config.elephant);
-  const uid = getUID();
+  const uid = await getUID(config.elephant);
   if (uid && uid !== -1) {
     vals.username = username ? username : `uid: ${uid}`;
   }
@@ -93,7 +93,7 @@ async function initTerminal(config: TerminalOptions, info: {[string]: mixed}) {
     let lazy_loader_obj = getOdooService("@web/legacy/js/public/lazyloader");
     if (typeof lazy_loader_obj !== 'undefined') {
       // Caching call: see command implementation for more details.
-      getUID();
+      await getUID(config.elephant);
       lazy_loader_obj = lazy_loader_obj[Symbol.for('default')];
       await lazy_loader_obj.allScriptsLoaded;
     }

diff --git a/src/js/page/odoo/commands/backoffice/lang.mjs b/src/js/page/odoo/commands/backoffice/lang.mjs
@@ -10,7 +10,7 @@ import searchRead from '@odoo/orm/search_read';
 import callModelMulti from '@odoo/osv/call_model_multi';
 import callModel from '@odoo/osv/call_model';
 import getContent from '@odoo/utils/get_content';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import file2base64 from '@terminal/utils/file2base64';
 import isEmpty from '@trash/utils/is_empty';
 import {ARG} from '@trash/constants';
@@ -152,6 +152,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['name'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'name ASC'},
       item => item.name,
     );
@@ -162,6 +163,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['code'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'code ASC'},
       item => item.code,
     );

diff --git a/src/js/page/odoo/commands/backoffice/settings.mjs b/src/js/page/odoo/commands/backoffice/settings.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import doAction from '@odoo/base/do_action';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDDef} from '@trash/interpreter';
 import type Terminal from '@terminal/terminal';
@@ -31,6 +31,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['name'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'name ASC'},
       item => item.name,
     );

diff --git a/src/js/page/odoo/commands/backoffice/view.mjs b/src/js/page/odoo/commands/backoffice/view.mjs
@@ -8,7 +8,7 @@ import doAction from '@odoo/base/do_action';
 import getParentAdapter from '@odoo/utils/get_parent_adapter';
 import getOdooService from '@odoo/utils/get_odoo_service';
 import getOdooVersion from '@odoo/utils/get_odoo_version';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDDef} from '@trash/interpreter';
 import type Terminal from '@terminal/terminal';
@@ -93,6 +93,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/caf.mjs b/src/js/page/odoo/commands/common/caf.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import callModel from '@odoo/osv/call_model';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import isEmpty from '@trash/utils/is_empty';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
@@ -67,6 +67,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/call.mjs b/src/js/page/odoo/commands/common/call.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import rpcQuery from '@odoo/rpc';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
@@ -33,6 +33,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/cam.mjs b/src/js/page/odoo/commands/common/cam.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import callModel from '@odoo/osv/call_model';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
@@ -45,6 +45,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/context.mjs b/src/js/page/odoo/commands/common/context.mjs
@@ -4,13 +4,14 @@
 
 // $FlowIgnore
 import i18n from 'i18next';
+import getSessionInfo from '@odoo/net_utils/get_session_info';
 import getOdooSession from '@odoo/utils/get_odoo_session';
 import getOdooVersion from '@odoo/utils/get_odoo_version';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 
 async function cmdContextOperation(kwargs: CMDCallbackArgs, ctx: CMDCallbackContext): Promise<mixed> {
-  const session = getOdooSession();
+  const session = getOdooSession()?.user_context || (await getSessionInfo())?.user_context;
   if (typeof session === 'undefined') {
     throw new Error(
       i18n.t('cmdContext.error.notSession', 'Cannot find session information')
@@ -29,22 +30,20 @@ async function cmdContextOperation(kwargs: CMDCallbackArgs, ctx: CMDCallbackCont
   }
 
   if (kwargs.operation === 'set') {
-    session.user_context = kwargs.value;
+    Object.apply(session, kwargs.value);
   } else if (kwargs.operation === 'write') {
-    Object.assign(session.user_context, kwargs.value);
+    Object.assign(session, kwargs.value);
   } else if (kwargs.operation === 'delete') {
-    // $FlowFixMe
-    if (Object.hasOwn(session.user_context, kwargs.value)) {
-      // $FlowFixMe
-      delete session.user_context[kwargs.value];
+    if (Object.hasOwn(session, kwargs.value)) {
+      delete session[kwargs.value];
     } else {
       throw new Error(
         i18n.t('cmdContext.error.keyNotPresent', 'The selected key is not present in the terminal context'),
       );
     }
   }
-  ctx.screen.print(session.user_context);
-  return session.user_context;
+  ctx.screen.print(session);
+  return session;
 }
 
 export default function (): Partial<CMDDef> {

diff --git a/src/js/page/odoo/commands/common/count.mjs b/src/js/page/odoo/commands/common/count.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import searchCount from '@odoo/orm/search_count';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
@@ -25,6 +25,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/create.mjs b/src/js/page/odoo/commands/common/create.mjs
@@ -6,7 +6,7 @@
 import i18n from 'i18next';
 import doAction from '@odoo/base/do_action';
 import createRecord from '@odoo/orm/create_record';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import Recordset from '@terminal/core/recordset';
 import renderRecordCreated from '@odoo/templates/record_created';
 import {ARG} from '@trash/constants';
@@ -43,6 +43,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/depends.mjs b/src/js/page/odoo/commands/common/depends.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import callModel from '@odoo/osv/call_model';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import getOdooVersion from '@odoo/utils/get_odoo_version';
 import isEmpty from '@trash/utils/is_empty';
 import {ARG} from '@trash/constants';
@@ -55,6 +55,7 @@ function getOptions(this: Terminal, arg_name: string): Promise<Array<string>> {
       [],
       ['name'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'name ASC'},
       item => item.name,
     );

diff --git a/src/js/page/odoo/commands/common/info.mjs b/src/js/page/odoo/commands/common/info.mjs
@@ -6,8 +6,8 @@
 import i18n from 'i18next';
 import getOdooRoot from '@odoo/utils/get_odoo_root';
 import getUrlInfo from '@odoo/utils/get_url_info';
-import getUID from '@odoo/utils/get_uid';
-import getUserName from '@odoo/utils/get_username';
+import getUID from '@odoo/net_utils/get_uid';
+import getUserName from '@odoo/net_utils/get_username';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
@@ -23,7 +23,7 @@ async function cmdInfo(this: Terminal, kwargs: CMDCallbackArgs, ctx: CMDCallback
       res = hasProps ? activeProps.resModel : getUrlInfo('hash', 'model');
     }
   } else if (kwargs.user_id) {
-    res = getUID();
+    res = await getUID(true);
   } else if (kwargs.user_login) {
     res = await getUserName(true);
   }

diff --git a/src/js/page/odoo/commands/common/install.mjs b/src/js/page/odoo/commands/common/install.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import callModelMulti from '@odoo/osv/call_model_multi';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import {searchModules} from './__utils__';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
@@ -57,6 +57,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['name'],
       this.getContext(),
+      undefined,
       {orderBy: 'name ASC'},
       item => item.name,
     );

diff --git a/src/js/page/odoo/commands/common/jstest.mjs b/src/js/page/odoo/commands/common/jstest.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import {ARG} from '@trash/constants';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import type {CMDCallbackArgs, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
 
@@ -30,6 +30,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['name'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'name ASC'},
       item => item.name,
     );

diff --git a/src/js/page/odoo/commands/common/login.mjs b/src/js/page/odoo/commands/common/login.mjs
@@ -5,8 +5,8 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import getOdooSession from '@odoo/utils/get_odoo_session';
-import cachedCallService from '@odoo/utils/cached_call_service';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedCallService from '@odoo/net_utils/cached_call_service';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
@@ -63,6 +63,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['login'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'login ASC'},
       item => item.name,
     );

diff --git a/src/js/page/odoo/commands/common/metadata.mjs b/src/js/page/odoo/commands/common/metadata.mjs
@@ -5,7 +5,7 @@
 // $FlowIgnore
 import i18n from 'i18next';
 import callModelMulti from '@odoo/osv/call_model_multi';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import renderMetadata from '@odoo/templates/metadata';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
@@ -57,6 +57,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/read.mjs b/src/js/page/odoo/commands/common/read.mjs
@@ -6,7 +6,7 @@
 import i18n from 'i18next';
 import callModel from '@odoo/osv/call_model';
 import searchRead from '@odoo/orm/search_read';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import Recordset from '@terminal/core/recordset';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
@@ -62,6 +62,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/search.mjs b/src/js/page/odoo/commands/common/search.mjs
@@ -6,7 +6,7 @@
 import i18n from 'i18next';
 import searchRead from '@odoo/orm/search_read';
 import getFieldsInfo from '@odoo/orm/get_fields_info';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {default as Recordset} from '@terminal/core/recordset';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
@@ -128,6 +128,7 @@ function getOptions(this: Terminal, arg_name: string) {
       [],
       ['model'],
       this.getContext({active_test: true}),
+      undefined,
       {orderBy: 'model ASC'},
       item => item.model,
     );

diff --git a/src/js/page/odoo/commands/common/uhg.mjs b/src/js/page/odoo/commands/common/uhg.mjs
@@ -7,16 +7,16 @@ import i18n from 'i18next';
 import callModel from '@odoo/osv/call_model';
 import callModelMulti from '@odoo/osv/call_model_multi';
 import getOdooVersion from '@odoo/utils/get_odoo_version';
-import getUID from '@odoo/utils/get_uid';
-import cachedSearchRead from '@odoo/utils/cached_search_read';
+import getUID from '@odoo/net_utils/get_uid';
+import cachedSearchRead from '@odoo/net_utils/cached_search_read';
 import {ARG} from '@trash/constants';
 import type {CMDCallbackArgs, CMDCallbackContext, CMDDef} from '@trash/interpreter';
 import type Terminal from '@odoo/terminal';
 
 async function cmdUserHasGroups(this: Terminal, kwargs: CMDCallbackArgs, ctx: CMDCallbackContext) {
   const OdooVerMajor = getOdooVersion('major');
   if (typeof OdooVerMajor === 'number' && OdooVerMajor >= 18) {
-    return callModelMulti<boolean>('res.users', [getUID()], 'has_group', [kwargs.group.join(',')], null, this.getContext()).then(
+    return callModelMulti<boolean>('res.users', [await getUID(true)], 'has_group', [kwargs.group.join(',')], null, this.getContext()).then(
       result => {
         ctx.screen.print(result);
         return result;