@odoo/o-spreadsheet 16.0.0 → 16.0.2

package/dist/o_spreadsheet.iife.js

@@ -2800,7 +2800,7 @@
           return `background-color: ${this.background}`;
       }
       get chartRuntime() {
-          const runtime = this.env.model.getters.getChartRuntime(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+          const runtime = this.env.model.getters.getChartRuntime(this.props.figure.id);
           if (!("chartJsConfig" in runtime)) {
               throw new Error("Unsupported chart runtime");
           }
@@ -3169,6 +3169,7 @@
       CommandResult[CommandResult["DuplicatedFigureId"] = 81] = "DuplicatedFigureId";
       CommandResult[CommandResult["InvalidSelectionStep"] = 82] = "InvalidSelectionStep";
       CommandResult[CommandResult["DuplicatedChartId"] = 83] = "DuplicatedChartId";
+      CommandResult[CommandResult["ChartDoesNotExist"] = 84] = "ChartDoesNotExist";
   })(exports.CommandResult || (exports.CommandResult = {}));
 
   var DIRECTION;
@@ -8637,7 +8638,7 @@
 
   class LineConfigPanel extends LineBarPieConfigPanel {
       get canTreatLabelsAsText() {
-          const chart = this.env.model.getters.getChart(this.props.sheetId, this.props.figureId);
+          const chart = this.env.model.getters.getChart(this.props.figureId);
           if (chart && chart instanceof LineChart) {
               return canChartParseLabels(chart, this.env.model.getters);
           }
@@ -8830,7 +8831,7 @@
               else {
                   this.shouldUpdateChart = true;
               }
-              if (!this.env.model.getters.isChartDefined(this.sheetId, this.figureId)) {
+              if (!this.env.model.getters.isChartDefined(this.figureId)) {
                   this.props.onCloseSidePanel();
                   return;
               }
@@ -8844,7 +8845,6 @@
               ...this.getChartDefinition(),
               ...updateDefinition,
           };
-          // TODORAR add a putain de test - c'est faux de nouveau ...
           return this.env.model.dispatch("UPDATE_CHART", {
               definition,
               id: this.figureId,
@@ -8852,12 +8852,11 @@
           });
       }
       onTypeChange(type) {
-          const context = this.env.model.getters.getContextCreationChart(this.sheetId, this.figureId);
+          const context = this.env.model.getters.getContextCreationChart(this.figureId);
           if (!context) {
               throw new Error("Chart not defined.");
           }
           const definition = getChartDefinitionFromContextCreation(context, type);
-          // TODORAR add a putain de test - c'est faux de nouveau ...
           this.env.model.dispatch("UPDATE_CHART", {
               definition,
               id: this.figureId,
@@ -8865,7 +8864,7 @@
           });
       }
       get chartPanel() {
-          const type = this.env.model.getters.getChartType(this.sheetId, this.figureId);
+          const type = this.env.model.getters.getChartType(this.figureId);
           if (!type) {
               throw new Error("Chart not defined.");
           }
@@ -8875,8 +8874,8 @@
           }
           return chartPanel;
       }
-      getChartDefinition() {
-          return this.env.model.getters.getChartDefinition(this.sheetId, this.figureId);
+      getChartDefinition(figureId = this.figureId) {
+          return this.env.model.getters.getChartDefinition(figureId);
       }
       get chartTypes() {
           return getChartTypes();
@@ -10012,7 +10011,7 @@
           this.ctx = document.createElement("canvas").getContext("2d");
       }
       get runtime() {
-          return this.env.model.getters.getChartRuntime(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+          return this.env.model.getters.getChartRuntime(this.props.figure.id);
       }
       get title() {
           return this.runtime.title;
@@ -10242,7 +10241,7 @@
           return registry;
       }
       get chartType() {
-          return this.env.model.getters.getChartType(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+          return this.env.model.getters.getChartType(this.props.figure.id);
       }
       onContextMenu(ev) {
           const position = {
@@ -26269,13 +26268,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               data = migrate(data);
           }
       }
-      // sanity check: try to fix missing fields/corrupted state by providing
-      // sensible default values
-      data = Object.assign(createEmptyWorkbookData(), data, { version: CURRENT_VERSION });
-      data.sheets = data.sheets.map((s, i) => Object.assign(createEmptySheet(`Sheet${i + 1}`, `Sheet${i + 1}`), s));
-      if (data.sheets.length === 0) {
-          data.sheets.push(createEmptySheet(INITIAL_SHEET_ID, "Sheet1"));
-      }
+      data = repairData(data);
       return data;
   }
   function migrate(data) {
@@ -26513,6 +26506,48 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           },
       },
   ];
+  /**
+   * This function is used to repair faulty data independently of the migration.
+   */
+  function repairData(data) {
+      data = forceUnicityOfFigure(data);
+      data = setDefaults(data);
+      return data;
+  }
+  /**
+   * Force the unicity of figure ids accross sheets
+   */
+  function forceUnicityOfFigure(data) {
+      if (data.uniqueFigureIds) {
+          return data;
+      }
+      const figureIds = new Set();
+      const uuidGenerator = new UuidGenerator();
+      for (const sheet of data.sheets || []) {
+          for (const figure of sheet.figures || []) {
+              if (figureIds.has(figure.id)) {
+                  figure.id += uuidGenerator.uuidv4();
+              }
+              figureIds.add(figure.id);
+          }
+      }
+      data.uniqueFigureIds = true;
+      return data;
+  }
+  /**
+   * sanity check: try to fix missing fields/corrupted state by providing
+   * sensible default values
+   */
+  function setDefaults(data) {
+      data = Object.assign(createEmptyWorkbookData(), data, { version: CURRENT_VERSION });
+      data.sheets = data.sheets
+          ? data.sheets.map((s, i) => Object.assign(createEmptySheet(`Sheet${i + 1}`, `Sheet${i + 1}`), s))
+          : [];
+      if (data.sheets.length === 0) {
+          data.sheets.push(createEmptySheet(INITIAL_SHEET_ID, "Sheet1"));
+      }
+      return data;
+  }
   /**
    * The goal of this function is to repair corrupted/wrong initial messages caused by
    * a bug.
@@ -26651,6 +26686,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           formats: {},
           borders: {},
           revisionId: DEFAULT_REVISION_ID,
+          uniqueFigureIds: true,
       };
       return data;
   }
@@ -27573,10 +27609,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.validateChartDefinition = (cmd) => validateChartDefinition(this, cmd.definition);
       }
       adaptRanges(applyChange) {
-          for (const sheetId of Object.keys(this.charts)) {
-              for (const [chartId, chart] of Object.entries(this.charts[sheetId] || {})) {
-                  this.history.update("charts", sheetId, chartId, chart === null || chart === void 0 ? void 0 : chart.updateRanges(applyChange));
-              }
+          for (const [chartId, chart] of Object.entries(this.charts)) {
+              this.history.update("charts", chartId, chart === null || chart === void 0 ? void 0 : chart.updateRanges(applyChange));
           }
       }
       // ---------------------------------------------------------------------------
@@ -27587,20 +27621,20 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               case "CREATE_CHART":
                   return this.checkValidations(cmd, this.chainValidations(this.validateChartDefinition, this.checkChartDuplicate));
               case "UPDATE_CHART":
-                  return this.validateChartDefinition(cmd);
+                  return this.checkValidations(cmd, this.chainValidations(this.validateChartDefinition, this.checkChartExists));
               default:
                   return 0 /* CommandResult.Success */;
           }
       }
       handle(cmd) {
-          var _a, _b;
+          var _a;
           switch (cmd.type) {
               case "CREATE_CHART":
                   this.addFigure(cmd.id, cmd.sheetId, cmd.position, cmd.size);
-                  this.addChart(cmd.id, cmd.sheetId, cmd.definition);
+                  this.addChart(cmd.id, cmd.definition);
                   break;
               case "UPDATE_CHART": {
-                  this.addChart(cmd.id, cmd.sheetId, cmd.definition);
+                  this.addChart(cmd.id, cmd.definition);
                   break;
               }
               case "DUPLICATE_SHEET": {
@@ -27609,7 +27643,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       if (fig.tag === "chart") {
                           const figureIdBase = fig.id.split(FIGURE_ID_SPLITTER).pop();
                           const duplicatedFigureId = `${cmd.sheetIdTo}${FIGURE_ID_SPLITTER}${figureIdBase}`;
-                          const chart = (_b = (_a = this.charts[cmd.sheetId]) === null || _a === void 0 ? void 0 : _a[fig.id]) === null || _b === void 0 ? void 0 : _b.copyForSheetId(cmd.sheetIdTo);
+                          const chart = (_a = this.charts[fig.id]) === null || _a === void 0 ? void 0 : _a.copyForSheetId(cmd.sheetIdTo);
                           if (chart) {
                               this.dispatch("CREATE_CHART", {
                                   id: duplicatedFigureId,
@@ -27624,44 +27658,44 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   break;
               }
               case "DELETE_FIGURE":
-                  this.history.update("charts", cmd.sheetId, cmd.id, undefined);
+                  this.history.update("charts", cmd.id, undefined);
                   break;
               case "DELETE_SHEET":
-                  this.history.update("charts", cmd.sheetId, undefined);
+                  for (let id of this.getChartIds(cmd.sheetId)) {
+                      this.history.update("charts", id, undefined);
+                  }
                   break;
           }
       }
       // ---------------------------------------------------------------------------
       // Getters
       // ---------------------------------------------------------------------------
-      getContextCreationChart(sheetId, figureId) {
-          var _a, _b;
-          return (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.getContextCreation();
-      }
-      getChart(sheetId, figureId) {
+      getContextCreationChart(figureId) {
           var _a;
-          return (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
+          return (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.getContextCreation();
       }
-      getChartType(sheetId, figureId) {
-          var _a, _b;
-          const type = (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.type;
+      getChart(figureId) {
+          return this.charts[figureId];
+      }
+      getChartType(figureId) {
+          var _a;
+          const type = (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.type;
           if (!type) {
               throw new Error("Chart not defined.");
           }
           return type;
       }
-      isChartDefined(sheetId, figureId) {
-          return figureId in (this.charts[sheetId] || {});
+      isChartDefined(figureId) {
+          return figureId in this.charts && this.charts !== undefined;
       }
       getChartIds(sheetId) {
-          // TODORAR refaire ce shit truc
-          // on veut un  truc du genre Object.keys(this.charts[sheetId] || {} a mon avis
-          // return (Object.values(this.charts[sheetId] || {}).filter(isDefined) as AbstractChart[]).map((chart) => chart.id);
-          return Object.keys(this.charts[sheetId] || {});
+          return Object.entries(this.charts)
+              .filter(([, chart]) => (chart === null || chart === void 0 ? void 0 : chart.sheetId) === sheetId)
+              .map(([id]) => id);
       }
-      getChartDefinition(sheetId, figureId) {
-          var _a, _b;
-          const definition = (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.getDefinition();
+      getChartDefinition(figureId) {
+          var _a;
+          const definition = (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.getDefinition();
           if (!definition) {
               throw new Error(`There is no chart with the given figureId: ${figureId}`);
           }
@@ -27673,28 +27707,35 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       import(data) {
           for (let sheet of data.sheets) {
               if (sheet.figures) {
-                  const charts = {};
                   for (let figure of sheet.figures) {
                       // TODO:
                       // figure data should be external IMO => chart should be in sheet.chart
                       // instead of in figure.data
                       if (figure.tag === "chart") {
-                          charts[figure.id] = this.createChart(figure.id, figure.data, sheet.id);
+                          this.charts[figure.id] = this.createChart(figure.id, figure.data, sheet.id);
                       }
                   }
-                  this.charts[sheet.id] = charts;
               }
           }
       }
       export(data) {
+          var _a;
           if (data.sheets) {
               for (let sheet of data.sheets) {
                   // TODO This code is false, if two plugins want ot insert figures on the sheet, it will crash !
                   const sheetFigures = this.getters.getFigures(sheet.id);
-                  const figures = sheetFigures;
-                  for (let figure of figures) {
+                  const figures = [];
+                  for (let sheetFigure of sheetFigures) {
+                      const figure = sheetFigure;
                       if (figure && figure.tag === "chart") {
-                          figure.data = this.getChartDefinition(sheet.id, figure.id);
+                          const data = (_a = this.charts[figure.id]) === null || _a === void 0 ? void 0 : _a.getDefinition();
+                          if (data) {
+                              figure.data = data;
+                              figures.push(figure);
+                          }
+                      }
+                      else {
+                          figures.push(figure);
                       }
                   }
                   sheet.figures = figures;
@@ -27702,13 +27743,13 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
       }
       exportForExcel(data) {
-          var _a, _b;
+          var _a;
           for (let sheet of data.sheets) {
               const sheetFigures = this.getters.getFigures(sheet.id);
               const figures = [];
               for (let figure of sheetFigures) {
                   if (figure && figure.tag === "chart") {
-                      const figureData = (_b = (_a = this.charts[sheet.id]) === null || _a === void 0 ? void 0 : _a[figure.id]) === null || _b === void 0 ? void 0 : _b.getDefinitionForExcel();
+                      const figureData = (_a = this.charts[figure.id]) === null || _a === void 0 ? void 0 : _a.getDefinitionForExcel();
                       if (figureData) {
                           figures.push({
                               ...figure,
@@ -27747,15 +27788,21 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * Add a chart in the local state. If a chart already exists, this chart is
        * replaced
        */
-      addChart(id, sheetId, definition) {
-          this.history.update("charts", sheetId, id, this.createChart(id, definition, sheetId));
+      addChart(id, definition) {
+          const sheetId = this.getters.getFigureSheetId(id);
+          if (sheetId) {
+              this.history.update("charts", id, this.createChart(id, definition, sheetId));
+          }
       }
       checkChartDuplicate(cmd) {
-          var _a;
-          if ((_a = this.charts[cmd.sheetId]) === null || _a === void 0 ? void 0 : _a[cmd.id]) {
-              return 83 /* CommandResult.DuplicatedChartId */;
-          }
-          return 0 /* CommandResult.Success */;
+          return this.getters.getFigureSheetId(cmd.id)
+              ? 83 /* CommandResult.DuplicatedChartId */
+              : 0 /* CommandResult.Success */;
+      }
+      checkChartExists(cmd) {
+          return this.getters.getFigureSheetId(cmd.id)
+              ? 0 /* CommandResult.Success */
+              : 84 /* CommandResult.ChartDoesNotExist */;
       }
   }
   ChartPlugin.getters = [
@@ -28136,7 +28183,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "CREATE_FIGURE":
-                  return this.checkFigureDuplicate(cmd.sheetId, cmd.figure.id);
+                  return this.checkFigureDuplicate(cmd.figure.id);
               case "UPDATE_FIGURE":
               case "DELETE_FIGURE":
                   return this.checkFigureExists(cmd.sheetId, cmd.id);
@@ -28202,9 +28249,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
           return 0 /* CommandResult.Success */;
       }
-      checkFigureDuplicate(sheetId, figureId) {
-          var _a;
-          if ((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) {
+      checkFigureDuplicate(figureId) {
+          if (Object.values(this.figures).find((sheet) => sheet === null || sheet === void 0 ? void 0 : sheet[figureId])) {
               return 81 /* CommandResult.DuplicatedFigureId */;
           }
           return 0 /* CommandResult.Success */;
@@ -28219,6 +28265,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           var _a;
           return (_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
       }
+      getFigureSheetId(figureId) {
+          return Object.keys(this.figures).find((sheetId) => { var _a; return ((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) !== undefined; });
+      }
       // ---------------------------------------------------------------------------
       // Import/Export
       // ---------------------------------------------------------------------------
@@ -28243,7 +28292,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.export(data);
       }
   }
-  FigurePlugin.getters = ["getFigures", "getFigure"];
+  FigurePlugin.getters = ["getFigures", "getFigure", "getFigureSheetId"];
 
   class FilterTable {
       constructor(zone) {
@@ -31535,7 +31584,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               throw new Error(`No figure for the given id: ${copiedFigureId}`);
           }
           this.copiedFigure = { ...figure };
-          const chart = getters.getChart(this.sheetId, copiedFigureId);
+          const chart = getters.getChart(copiedFigureId);
           if (!chart) {
               throw new Error(`No chart for the given id: ${copiedFigureId}`);
           }
@@ -31987,9 +32036,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return formatColors.filter(isDefined$1);
       }
       getChartColors(sheetId) {
-          const charts = this.getters
-              .getChartIds(sheetId)
-              .map((cid) => this.getters.getChart(sheetId, cid));
+          const charts = this.getters.getChartIds(sheetId).map((cid) => this.getters.getChart(cid));
           let chartsColors = new Set();
           for (let chart of charts) {
               if (chart === undefined) {
@@ -32256,37 +32303,34 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               invalidateCFEvaluationCommands.has(cmd.type) ||
               cmd.type === "EVALUATE_CELLS" ||
               cmd.type === "UPDATE_CELL") {
-              for (const sheetId in this.charts) {
-                  for (const chartId in this.charts[sheetId]) {
-                      this.charts[sheetId][chartId] = undefined;
-                  }
+              for (const chartId in this.charts) {
+                  this.charts[chartId] = undefined;
               }
           }
           switch (cmd.type) {
               case "UPDATE_CHART":
               case "CREATE_CHART":
               case "DELETE_FIGURE":
-                  if (this.charts[cmd.sheetId]) {
-                      this.charts[cmd.sheetId][cmd.id] = undefined;
-                  }
+                  this.charts[cmd.id] = undefined;
                   break;
               case "DELETE_SHEET":
-                  delete this.charts[cmd.sheetId];
+                  for (let chartId in this.charts) {
+                      if (!this.getters.isChartDefined(chartId)) {
+                          this.charts[chartId] = undefined;
+                      }
+                  }
                   break;
           }
       }
-      getChartRuntime(sheetId, figureId) {
-          var _a;
-          if (!((_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId])) {
-              const chart = this.getters.getChart(sheetId, figureId);
+      getChartRuntime(figureId) {
+          if (!this.charts[figureId]) {
+              const chart = this.getters.getChart(figureId);
               if (!chart) {
                   throw new Error(`No chart for the given id: ${figureId}`);
               }
-              if (!this.charts[sheetId])
-                  this.charts[sheetId] = {};
-              this.charts[sheetId][figureId] = this.createRuntimeChart(chart);
+              this.charts[figureId] = this.createRuntimeChart(chart);
           }
-          return this.charts[sheetId][figureId];
+          return this.charts[figureId];
       }
       /**
        * Get the background color of a chart based on the color of the first cell of the main range
@@ -42410,9 +42454,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.0';
-  __info__.date = '2023-02-27T14:34:11.940Z';
-  __info__.hash = '7081532';
+  __info__.version = '16.0.2';
+  __info__.date = '2023-03-06T07:17:51.313Z';
+  __info__.hash = '6b4d816';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);