Skip to content

Commit

Permalink
chore(*): merged remote dev to local
Browse files Browse the repository at this point in the history
  • Loading branch information
Omri-Levy committed Dec 11, 2024
2 parents e4170e4 + 3750829 commit 377fc15
Show file tree
Hide file tree
Showing 89 changed files with 2,163 additions and 2,691 deletions.
20 changes: 20 additions & 0 deletions apps/backoffice-v2/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# @ballerine/backoffice-v2

## 0.7.81

### Patch Changes

- Bump
- Updated dependencies
- @ballerine/blocks@0.2.29
- @ballerine/common@0.9.58
- @ballerine/react-pdf-toolkit@1.2.50
- @ballerine/ui@0.5.50
- @ballerine/workflow-browser-sdk@0.6.77
- @ballerine/workflow-node-sdk@0.6.77

## 0.7.80

### Patch Changes

- @ballerine/workflow-browser-sdk@0.6.76
- @ballerine/workflow-node-sdk@0.6.76

## 0.7.79

### Patch Changes
Expand Down
18 changes: 9 additions & 9 deletions apps/backoffice-v2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ballerine/backoffice-v2",
"version": "0.7.79",
"version": "0.7.81",
"description": "Ballerine - Backoffice",
"homepage": "https://github.com/ballerine-io/ballerine",
"type": "module",
Expand Down Expand Up @@ -51,12 +51,12 @@
"preview": "vite preview"
},
"dependencies": {
"@ballerine/blocks": "0.2.28",
"@ballerine/common": "0.9.57",
"@ballerine/react-pdf-toolkit": "^1.2.48",
"@ballerine/ui": "^0.5.48",
"@ballerine/workflow-browser-sdk": "0.6.75",
"@ballerine/workflow-node-sdk": "0.6.75",
"@ballerine/blocks": "0.2.29",
"@ballerine/common": "0.9.58",
"@ballerine/react-pdf-toolkit": "^1.2.50",
"@ballerine/ui": "^0.5.50",
"@ballerine/workflow-browser-sdk": "0.6.77",
"@ballerine/workflow-node-sdk": "0.6.77",
"@botpress/webchat": "^2.1.10",
"@botpress/webchat-generator": "^0.2.9",
"@fontsource/inter": "^4.5.15",
Expand Down Expand Up @@ -148,8 +148,8 @@
"zod": "^3.23.4"
},
"devDependencies": {
"@ballerine/config": "^1.1.26",
"@ballerine/eslint-config-react": "^2.0.26",
"@ballerine/config": "^1.1.27",
"@ballerine/eslint-config-react": "^2.0.27",
"@cspell/cspell-types": "^6.31.1",
"@faker-js/faker": "^7.6.0",
"@playwright/test": "^1.32.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/backoffice-v2/src/domains/notes/Notes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const Notes = ({
size={`sm`}
aria-disabled={isLoading}
className={
'mt-3 h-5 self-end p-4 text-sm font-medium aria-disabled:pointer-events-none aria-disabled:opacity-50'
'mt-3 h-5 self-end p-4 text-sm font-medium enabled:bg-primary enabled:hover:bg-primary/90 aria-disabled:pointer-events-none aria-disabled:opacity-50'
}
>
<Loader2 className={ctw('me-2 h-4 w-4 animate-spin', { hidden: !isLoading })} />
Expand Down
7 changes: 2 additions & 5 deletions apps/backoffice-v2/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,7 @@
}
}

a.bpComposerPoweredBy {
a.bpComposerPoweredBy,
div.bpHeaderExpandedContentDescriptionItemsPoweredBy {
display: none !important;
}

button.bpModalDialogNewConversationButton {
background-color: var(--bpPrimary-500) !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ export const CallToActionLegacy: FunctionComponent<ICallToActionLegacyProps> = (
size="wide"
variant="warning"
disabled={disabled}
className={ctw({ 'flex gap-2': isReuploadResetable })}
className={ctw(
{ 'flex gap-2': isReuploadResetable },
'enabled:bg-warning enabled:hover:bg-warning/90',
)}
>
{value.text}
{isReuploadResetable && (
Expand Down Expand Up @@ -253,9 +256,11 @@ export const CallToActionLegacy: FunctionComponent<ICallToActionLegacyProps> = (
}
close={
<Button
className={ctw(`gap-x-2`, {
loading: isLoadingReuploadNeeded,
})}
className={ctw(
'gap-x-2',
{ loading: isLoadingReuploadNeeded },
'enabled:bg-primary enabled:hover:bg-primary/90',
)}
onClick={onReuploadNeeded({
workflowId: workflow?.id,
documentId: id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ export const EditableDetails: FunctionComponent<IEditableDetails> = ({
{data?.some(({ isEditable }) => isEditable) && (
<Button
type="submit"
className={`ms-auto mt-3 aria-disabled:pointer-events-none aria-disabled:opacity-50`}
className={`ms-auto mt-3 enabled:bg-primary enabled:hover:bg-primary/90 aria-disabled:pointer-events-none aria-disabled:opacity-50`}
aria-disabled={isSaveDisabled}
>
Save
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ export const useDirectorsBlocks = ({
disabled={isApproveDisabled}
size={'wide'}
variant={'success'}
className={'enabled:bg-success enabled:hover:bg-success/90'}
>
Approve
</MotionButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ export const useDocumentBlocks = ({
disabled={!canApprove}
size={'wide'}
variant={'success'}
className={'enabled:bg-success enabled:hover:bg-success/90'}
>
Approve
</MotionButton>
Expand Down Expand Up @@ -439,14 +440,12 @@ export const useDocumentBlocks = ({
const fieldValue = getFieldValue();
const isEditableDecision = isDoneWithRevision || !decision?.status;
const isIndividual = checkIsIndividual(workflow);
const isEditableType = (title === 'type' && isIndividual) || title !== 'type';
const isEditableCategory =
(title === 'category' && isIndividual) || title !== 'category';
const isEditableField = [
isEditableDecision,
isEditable,
caseState.writeEnabled,
isEditableType,
isEditableCategory,
].every(Boolean);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ export const DefaultActions = () => {
size="md"
variant="warning"
disabled={isLoadingActions || !canRevision}
className={ctw({ loading: debouncedIsLoadingRejectCase }, 'whitespace-nowrap')}
className={ctw(
{ loading: debouncedIsLoadingRejectCase },
'whitespace-nowrap',
'enabled:bg-warning enabled:hover:bg-warning/90',
)}
>
Ask for all re-uploads {canRevision && `(${documentsToReviseCount})`}
</Button>
Expand All @@ -57,9 +61,11 @@ export const DefaultActions = () => {
<DialogFooter>
<DialogClose asChild>
<Button
className={ctw(`gap-x-2`, {
loading: debouncedIsLoadingRevisionCase,
})}
className={ctw(
'gap-x-2',
{ loading: debouncedIsLoadingRevisionCase },
'enabled:bg-primary enabled:hover:bg-primary/90',
)}
disabled={isLoadingActions || !canRevision}
onClick={onMutateRevisionCase}
>
Expand Down
19 changes: 5 additions & 14 deletions apps/backoffice-v2/src/pages/Root/Root.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { Providers } from '../../common/components/templates/Providers/Providers
import { useCustomerQuery } from '@/domains/customer/hooks/queries/useCustomerQuery/useCustomerQuery';
import { FullScreenLoader } from '@/common/components/molecules/FullScreenLoader/FullScreenLoader';
import Chatbot from '@/domains/chat/chatbot-opengpt';
import { RenderChildrenInIFrame } from '@/common/components/organisms/RenderChildrenInIFrame/RenderChildrenInIFrame';
import { ctw } from '@/common/utils/ctw/ctw';
import { env } from '@/common/env/env';
import { Outlet } from 'react-router-dom';
import { ServerDownLayout } from './ServerDown.layout';
Expand Down Expand Up @@ -35,18 +33,11 @@ const ChatbotLayout: FunctionComponent = () => {
const botpressClientId = customer?.features?.chatbot?.clientId || env.VITE_BOTPRESS_CLIENT_ID;

return (
<RenderChildrenInIFrame
className={ctw('fixed bottom-right-0', {
'h-[700px] w-[400px]': isWebchatOpen,
'd-[80px]': !isWebchatOpen,
})}
>
<Chatbot
isWebchatOpen={isWebchatOpen}
toggleIsWebchatOpen={toggleIsWebchatOpen}
botpressClientId={botpressClientId}
/>
</RenderChildrenInIFrame>
<Chatbot
isWebchatOpen={isWebchatOpen}
toggleIsWebchatOpen={toggleIsWebchatOpen}
botpressClientId={botpressClientId}
/>
);
};

Expand Down
5 changes: 4 additions & 1 deletion apps/backoffice-v2/src/pages/SignIn/SignIn.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ export const SignIn: FunctionComponent = () => {
)}
/>
<div className={`flex justify-end`}>
<Button type="submit" className={`ms-auto mt-3`}>
<Button
type="submit"
className={'ms-auto mt-3 enabled:bg-primary enabled:hover:bg-primary/90'}
>
Sign In
</Button>
</div>
Expand Down
17 changes: 17 additions & 0 deletions apps/kyb-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# kyb-app

## 0.3.93

### Patch Changes

- Bump
- Updated dependencies
- @ballerine/blocks@0.2.29
- @ballerine/common@0.9.58
- @ballerine/ui@0.5.50
- @ballerine/workflow-browser-sdk@0.6.77

## 0.3.92

### Patch Changes

- @ballerine/workflow-browser-sdk@0.6.76

## 0.3.91

### Patch Changes
Expand Down
14 changes: 7 additions & 7 deletions apps/kyb-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ballerine/kyb-app",
"private": true,
"version": "0.3.91",
"version": "0.3.93",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -15,10 +15,10 @@
"test:dev": "vitest"
},
"dependencies": {
"@ballerine/blocks": "0.2.28",
"@ballerine/common": "^0.9.57",
"@ballerine/ui": "0.5.49",
"@ballerine/workflow-browser-sdk": "0.6.75",
"@ballerine/blocks": "0.2.29",
"@ballerine/common": "^0.9.58",
"@ballerine/ui": "0.5.50",
"@ballerine/workflow-browser-sdk": "0.6.77",
"@lukemorales/query-key-factory": "^1.0.3",
"@radix-ui/react-icons": "^1.3.0",
"@rjsf/core": "^5.9.0",
Expand Down Expand Up @@ -64,8 +64,8 @@
"zod": "^3.23.4"
},
"devDependencies": {
"@ballerine/config": "^1.1.26",
"@ballerine/eslint-config-react": "^2.0.26",
"@ballerine/config": "^1.1.27",
"@ballerine/eslint-config-react": "^2.0.27",
"@jest/globals": "^29.7.0",
"@sentry/vite-plugin": "^2.9.0",
"@testing-library/jest-dom": "^6.1.4",
Expand Down
46 changes: 35 additions & 11 deletions apps/kyb-app/src/pages/CollectionFlow/CollectionFlow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,19 +246,43 @@ export const CollectionFlow = withSessionProtected(() => {
<AppShell.Content>
<AppShell.FormContainer>
{localStorage.getItem('devmode') ? (
<div className="flex flex-col gap-4">
DEBUG
<div>
{currentPage
? currentPage.stateName
: 'Page not found and state ' + state}
<div className="mb-6 rounded-lg border border-amber-200 bg-amber-50 p-4">
<div className="mb-4 flex items-center gap-2">
<div className="h-2 w-2 animate-pulse rounded-full bg-amber-500" />
<span
className="cursor-help font-medium text-amber-900 hover:underline"
data-tooltip-id="debug-mode-tooltip"
data-tooltip-content="In debug mode you can navigate between steps without validation. Be aware that if required data is missing, plugins may fail when processing data at the end of the flow."
>
Debug Mode Active
</span>
</div>
<div className="flex gap-4">
<button onClick={() => stateApi.sendEvent('PREVIOUS')}>
prev

<div className="mb-3 text-sm text-amber-800">
Current State:{' '}
{currentPage ? (
<span className="font-medium">
{currentPage.stateName}
</span>
) : (
<span className="italic">
Page not found - state: {state}
</span>
)}
</div>

<div className="flex gap-3">
<button
onClick={() => stateApi.sendEvent('PREVIOUS')}
className="rounded bg-amber-100 px-3 py-1.5 text-sm font-medium text-amber-900 transition-colors hover:bg-amber-200"
>
Previous
</button>
<button onClick={() => stateApi.sendEvent('NEXT')}>
next
<button
onClick={() => stateApi.sendEvent('NEXT')}
className="rounded bg-amber-100 px-3 py-1.5 text-sm font-medium text-amber-900 transition-colors hover:bg-amber-200"
>
Next
</button>
</div>
</div>
Expand Down
9 changes: 9 additions & 0 deletions apps/workflows-dashboard/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @ballerine/workflows-dashboard

## 0.2.27

### Patch Changes

- Bump
- Updated dependencies
- @ballerine/common@0.9.58
- @ballerine/ui@0.5.50

## 0.2.26

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions apps/workflows-dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ballerine/workflows-dashboard",
"private": false,
"version": "0.2.26",
"version": "0.2.27",
"type": "module",
"scripts": {
"spellcheck": "cspell \"*\"",
Expand All @@ -15,8 +15,8 @@
"test": "NODE_ENV=test jest"
},
"dependencies": {
"@ballerine/common": "^0.9.55",
"@ballerine/ui": "^0.5.48",
"@ballerine/common": "^0.9.58",
"@ballerine/ui": "^0.5.50",
"@lukemorales/query-key-factory": "^1.0.3",
"@radix-ui/react-avatar": "^1.0.3",
"@radix-ui/react-dialog": "1.0.4",
Expand Down Expand Up @@ -63,8 +63,8 @@
"zod": "^3.22.3"
},
"devDependencies": {
"@ballerine/config": "^1.1.26",
"@ballerine/eslint-config-react": "^2.0.26",
"@ballerine/config": "^1.1.27",
"@ballerine/eslint-config-react": "^2.0.27",
"@cspell/cspell-types": "^6.31.1",
"@types/axios": "^0.14.0",
"@types/classnames": "^2.3.1",
Expand Down
Loading

0 comments on commit 377fc15

Please sign in to comment.