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

feat: sync changes from v2 to v2-develop #860

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c520994
fix: improve action separator and treeactions bar
mguellsegarra Jan 22, 2025
1600b5c
feat: extract toolbar behaviour to hooks
mguellsegarra Jan 22, 2025
4e8627e
feat: improve actionbar components with react best practices
mguellsegarra Jan 22, 2025
0081027
feat: add new localization strings and improve One2many top bar
mguellsegarra Jan 22, 2025
4d82eac
feat: improve form handling and toolbar integration in One2many compo…
mguellsegarra Jan 22, 2025
0419afe
feat: allow use of hooks from one2many's
mguellsegarra Jan 23, 2025
36913b2
Merge branch 'v2' into feat/add-toolbar-buttons-to-x2many
mguellsegarra Jan 23, 2025
b91ffeb
Merge branch 'v2' into feat/add-toolbar-buttons-to-x2many
mguellsegarra Jan 23, 2025
6c09769
fix: bad conflict resolution
mguellsegarra Jan 23, 2025
b9f3d30
fix: adjust sharebutton for formactionbar
mguellsegarra Jan 23, 2025
c68ec43
fix: remove unused function
mguellsegarra Jan 24, 2025
2563045
Merge branch 'v2' into feat/add-toolbar-buttons-to-x2many
mguellsegarra Jan 24, 2025
9fd9d6a
fix: adjust value key filtering in URL sharing
mguellsegarra Jan 24, 2025
1b5d7dd
fix: improve value merging logic in useUrlFromCurrentTab
mguellsegarra Jan 24, 2025
c79c3e0
fix: improve and export parameter filtering
mguellsegarra Jan 25, 2025
28fff0a
fix: transform initialView to initialViewId
mguellsegarra Jan 25, 2025
bf072e5
fix: also clear url when closing all tabs
mguellsegarra Jan 26, 2025
68d42f0
fix: clear title when no tabs
mguellsegarra Jan 28, 2025
c0e6959
Merge pull request #857 from gisce/fix/clear-title-when-no-tabs
mguellsegarra Jan 28, 2025
b46cf2f
chore(release): 2.58.1 [skip ci]
semantic-release-bot Jan 28, 2025
6251874
feat: fetch toolbar if needed and if view of one2many is hardcoded
mguellsegarra Jan 28, 2025
85f1f6e
Merge branch 'v2' into feat/add-toolbar-buttons-to-x2many
mguellsegarra Jan 28, 2025
7470e76
fix: temporally disable toolbar in one2many's until we decide which d…
mguellsegarra Jan 28, 2025
8a4745d
Merge branch 'feat/add-toolbar-buttons-to-x2many' into v2
mguellsegarra Jan 28, 2025
5a59093
chore(release): 2.59.0 [skip ci]
semantic-release-bot Jan 28, 2025
c2f2110
Merge remote-tracking branch 'origin/v2' into sync/v2-to-v2-develop-2…
github-actions[bot] Jan 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gisce/react-ooui",
"version": "2.59.0-rc.1",
"version": "2.59.0",
"engines": {
"node": "20.5.0"
},
Expand Down
6 changes: 6 additions & 0 deletions src/actionbar/ActionBarSeparator.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { memo } from "react";

export const ActionBarSeparator = memo(() => (
<div className="inline-block w-2" />
));
ActionBarSeparator.displayName = "ActionBarSeparator";
1 change: 0 additions & 1 deletion src/actionbar/ActionButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from "react";
import ButtonWithTooltip from "@/common/ButtonWithTooltip";
import { LoadingOutlined } from "@ant-design/icons";
import { ButtonProps } from "antd";
Expand Down
6 changes: 1 addition & 5 deletions src/actionbar/DashboardActionBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ import {
BorderOuterOutlined,
} from "@ant-design/icons";
import { useLocale } from "@gisce/react-formiga-components";
import {
ActionViewContext,
ActionViewContextType,
} from "@/context/ActionViewContext";
import { ActionBarSeparator } from "./ActionBarSeparator";
import { ShareUrlButton } from "./ShareUrlButton";
import { ActionBarSeparator } from "./FormActionBar";

function DashboardActionBar() {
const { isLoading, dashboardRef, moveItemsEnabled, setMoveItemsEnabled } =
Expand Down
Loading