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

426 emtpy screen notes events #459

Merged
merged 12 commits into from
Aug 13, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,19 @@ export const useStyles = createStyles(({ token, css }) => {
.notes-container {
display: flex;
flex-direction: column;
flex-grow: 1;
width: ${notesAndEventsToken.notesContainerWidth}px;
}

& .notes-content {
display: flex;
flex-direction: column;
align-items: flex-start;
overflow: auto;

height: 100%;
}

& .notes-content__header {
padding: ${token.paddingXS}px ${notesAndEventsToken.paddingSM}px;

display: flex;
align-items: center;
gap: ${notesAndEventsToken.paddingSM}px;
Expand All @@ -54,12 +52,17 @@ export const useStyles = createStyles(({ token, css }) => {
& .notes-content__text {
color: ${token.colorPrimary};
margin: 0;
font-weight: 600;
}

& .notes-content__details {
width: 100%;
padding: 0 ${token.paddingXS}px;
}
}

& .notes-content__empty-container {
align-content: center;
height: 100%;
}

& .notes-card {
margin-bottom: ${token.marginXS}px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

import React from 'react'
import { useTranslation } from 'react-i18next'
import { useStyles } from '@Pimcore/modules/asset/editor/shared-tab-manager/tabs/notes-and-events/notes-and-events-view.style'
import {
useStyles
} from '@Pimcore/modules/asset/editor/shared-tab-manager/tabs/notes-and-events/notes-and-events-view.style'
import { Button, Input, Select } from 'antd'
import {
type Note
Expand All @@ -25,6 +27,7 @@ import { useModal } from '@Pimcore/components/modal/useModal'
import { ModalFooter } from '@Pimcore/components/modal/footer/modal-footer'
import TextArea from 'antd/es/input/TextArea'
import { respectLineBreak } from '@Pimcore/utils/helpers'
import { NoContent } from '@Pimcore/components/no-content/no-content'

interface NotesAndEventsTabViewProps {
notes: Note[]
Expand Down Expand Up @@ -139,9 +142,18 @@ export const NotesAndEventsTabView = ({
</Button>
{modal}
</div>
<div className={ 'notes-content__details' }>
{NotesAndEvents}
</div>
{notes.length > 0
? (
<div className={ 'notes-content__details' }>
{NotesAndEvents}
</div>
)
: (
<div className={ 'notes-content__empty-container' }>
<NoContent text={ t('notes-and-events.no-notes-and-events-to-show') } />
</div>
)
}
</div>
<div className={ 'notes-container__pagination-container' }>
<div className={ 'notes-container__pagination' }>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/build/2f6184a0-538b-439a-9787-83e6d5d970de/entrypoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"entrypoints": {
"core-dll": {
"css": [
"/bundles/pimcorestudioui/build/2f6184a0-538b-439a-9787-83e6d5d970de/core-dll.css"
],
"js": [
"/bundles/pimcorestudioui/build/2f6184a0-538b-439a-9787-83e6d5d970de/core-dll.js"
]
}
}
}

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions public/build/c929af18-3592-4dc0-a15c-3cb09d20ca62/entrypoints.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"entrypoints": {
"main": {
"js": [
"/bundles/pimcorestudioui/build/d0bfda6d-2190-4d5a-aa78-077c95a8642d/main.js"
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"bundles/pimcorestudioui/build/d0bfda6d-2190-4d5a-aa78-077c95a8642d/main.js": "/bundles/pimcorestudioui/build/d0bfda6d-2190-4d5a-aa78-077c95a8642d/main.js"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"entrypoints": {
"vendor": {
"js": [
"/bundles/pimcorestudioui/build/ef886b22-0899-4148-b13b-cd4b989c8158/vendor.js"
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"bundles/pimcorestudioui/build/ef886b22-0899-4148-b13b-cd4b989c8158/vendor.js": "/bundles/pimcorestudioui/build/ef886b22-0899-4148-b13b-cd4b989c8158/vendor.js"
}

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions translations/studio.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ notes-and-events.seo: seo
notes-and-events.warning: warning
notes-and-events.notice: notice
notes-and-events.erp_import: erp_import
notes-and-events.no-notes-and-events-to-show: There are no notes or events to show.
add: Add
save: Save
type: Type
Expand Down
Loading