Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Frontend imports were pointing to removed packages #2316

Merged
merged 2 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ You should have received a copy of the GNU General Public License
along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.
*/


import { action, computed, flow, observable } from "mobx";
import { toOrigamServerString } from "@origam/utils";
import { getDefaultCsDateFormatDataFromCookie } from "utils/cookies";
import DateCompleter from "gui/Components/ScreenElements/Editors/DateCompleter";
import moment, { Moment } from "moment";
import { isRefreshShortcut, isSaveShortcut } from "utils/keyShortcuts";
import { toOrigamServerString } from "utils/moment";

export interface IEditorState{
value: string | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import {
} from "gui/Components/ScreenElements/Table/TableRendering/renderingValues";
import { setTableDebugValue } from "gui/Components/ScreenElements/Table/TableRendering/DebugTableMonitor";
import { CellAlignment } from "gui/Components/ScreenElements/Table/TableRendering/cells/cellAlignment";
import { flashColor2htmlColor } from "@origam/utils";
import { flashColor2htmlColor } from "utils/flashColorFormat";

interface IDataCellRenderer {
drawCellText(): void;
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/OpenedScreen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { action, computed, observable } from "mobx";
import { IFormScreenEnvelope } from "./types/IFormScreen";
import { IMainMenuItemType } from "./types/IMainMenu";
import { getTablePanelView } from "model/selectors/TablePanelView/getTablePanelView";
import { EventHandler } from "@origam/utils";
import { EventHandler } from "utils/EventHandler";

export class DialogInfo implements IDialogInfo {
constructor(public width: number, public height: number) {
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/OrigamApiHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.
*/

import moment, { Moment } from "moment";
import { toOrigamServerString } from "@origam/utils";
import { IFilter } from "./types/IFilter";
import { toOrigamServerString } from "utils/moment";

export function joinWithAND(filterItems: string[]) {
if (filterItems.length === 0) return "";
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/RowState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import { getSessionId } from "model/selectors/getSessionId";
import { IRowState, IRowStateColumnItem, IRowStateItem } from "./types/IRowState";
import { FlowBusyMonitor } from "utils/flow";
import { handleError } from "model/actions/handleError";
import { flashColor2htmlColor } from "@origam/utils";
import { visibleRowsChanged } from "gui/Components/ScreenElements/Table/TableRendering/renderTable";
import { getDataSource } from "model/selectors/DataSources/getDataSource";
import { flashColor2htmlColor } from "utils/flashColorFormat";

const defaultRowStatesToFetch = 100;

Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/WebScreen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { IOpenedScreen } from "./types/IOpenedScreen";
import { action, observable } from "mobx";
import { IFormScreenEnvelope } from "./types/IFormScreen";
import { IMainMenuItemType } from "./types/IMainMenu";
import { EventHandler } from "@origam/utils";
import { EventHandler } from "utils/EventHandler";

export class WebScreen implements IWebScreen, IOpenedScreen {
$type_IOpenedScreen: 1 = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ import { getFavorites } from "model/selectors/MainMenu/getFavorites";
import { produce } from "immer";
import { IDataView } from "../types/IDataView";
import { FormScreenEnvelope } from "model/entities/FormScreen";
import { EventHandler } from "@origam/utils";
import { hexToRgb } from "utils/colorUtils";
import { KeyBuffer } from "model/entities/WorkbenchLifecycle/KeyBuffer";
import { EventHandler } from "utils/EventHandler";
import { getWorkbench } from "model/selectors/getWorkbench";

export enum IRefreshOnReturnType {
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/types/IOpenedScreen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.

import { IFormScreenEnvelope } from "./IFormScreen";
import { IMainMenuItemType } from "./IMainMenu";
import { EventHandler } from "@origam/utils";
import { EventHandler } from "utils/EventHandler";

export interface IDialogInfo {
width: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { IDialogInfo, IOpenedScreen } from "./IOpenedScreen";
import { IMainMenuItemType } from "./IMainMenu";
import { IUserInfo } from "model/entities/types/IUserInfo";
import { IPortalSettings } from "model/entities/types/IPortalSettings";
import { EventHandler } from "@origam/utils";
import { EventHandler } from "utils/EventHandler";
import { IRefreshOnReturnType } from "model/entities/WorkbenchLifecycle/WorkbenchLifecycle";
import { KeyBuffer } from "model/entities/WorkbenchLifecycle/KeyBuffer";

Expand Down
4 changes: 3 additions & 1 deletion frontend-html/src/plugins/tools/Localizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.

import { getLocaleFromCookie } from "utils/cookies";
import MessageFormat from '@messageformat/core';
import { DataType, ILocalization, ILocalizer, } from "@origam/plugins";
import { formatNumber } from "model/entities/NumberFormating";
import { ILocalizer } from "plugins/interfaces/ILocalizer";
import { ILocalization } from "plugins/interfaces/ILocalization";
import { DataType } from "plugins/interfaces/DataType";

export class Localizer implements ILocalizer {

Expand Down
6 changes: 3 additions & 3 deletions frontend-html/src/xmlInterpreters/getMomentFormat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ You should have received a copy of the GNU General Public License
along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.
*/

import { csToMomentFormat } from "@origam/utils";
import { T } from "../utils/translation";
import { getDefaultCsDateFormatDataFromCookie } from "../utils/cookies";
import { T } from "utils/translation";
import { getDefaultCsDateFormatDataFromCookie } from "utils/cookies";
import { csToMomentFormat } from "utils/dateConversion";

export function replaceDefaultDateFormats(formatFromServer: string) {
if (formatFromServer === "long") {
Expand Down