Skip to content

Commit

Permalink
426 emtpy screen notes events (#459)
Browse files Browse the repository at this point in the history
  • Loading branch information
xIrusux authored Aug 13, 2024
1 parent 02b37a6 commit fe40261
Show file tree
Hide file tree
Showing 21 changed files with 1,309 additions and 9 deletions.
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
2 changes: 2 additions & 0 deletions public/build/2f6184a0-538b-439a-9787-83e6d5d970de/105.js

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*!
*
* /**
* * Pimcore
* *
* * This source file is available under two different licenses:
* * - Pimcore Open Core License (POCL)
* * - Pimcore Commercial License (PCL)
* * Full copyright and license information is available in
* * LICENSE.md which is distributed with this source code.
* *
* * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* * @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL
* * /
*
*/
16 changes: 16 additions & 0 deletions public/build/2f6184a0-538b-439a-9787-83e6d5d970de/core-dll.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public/build/2f6184a0-538b-439a-9787-83e6d5d970de/core-dll.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/*!
*
* /**
* * Pimcore
* *
* * This source file is available under two different licenses:
* * - Pimcore Open Core License (POCL)
* * - Pimcore Commercial License (PCL)
* * Full copyright and license information is available in
* * LICENSE.md which is distributed with this source code.
* *
* * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* * @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL
* * /
*
*/

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/**
* react-table
*
* Copyright (c) TanStack
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* table-core
*
* Copyright (c) TanStack
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* @license React
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* use-sync-external-store-with-selector.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @remix-run/router v1.16.1
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router DOM v6.23.1
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router v6.23.1
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* Pimcore
*
* This source file is available under two different licenses:
* - Pimcore Open Core License (POCL)
* - Pimcore Commercial License (PCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL
*/
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"
]
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit fe40261

Please sign in to comment.