Skip to content

refactor:removed index from logscreen and copilot suggestions #680

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.

Sign up for GitHub

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

Merged
sayalijoshi27 merged 2 commits into from
Jun 3, 2025
Merged

refactor:removed index from logscreen and copilot suggestions #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1472346
refactor:removed index from logscreen and copilot suggestions
AishDani Jun 3, 2025
c8f19af
refactor:resolved PR comments
AishDani Jun 3, 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
6 changes: 3 additions & 3 deletions api/src/utils/content-type-creator.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,9 +685,9 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {

for (const field2 of schema2) {
if (field2?.data_type === 'group') {
const machingGroup = findGroupByUid(schema1, field2?.uid);
if(machingGroup){
const schema = await mergeArrays(machingGroup?.schema ?? [],field2?.schema ?? [] );
const matchingGroup = findGroupByUid(schema1, field2?.uid);
if(matchingGroup){
const schema = mergeArrays(matchingGroup?.schema ?? [],field2?.schema ?? [] );
result?.push({
...field2,
schema: schema
Expand Down
1 change: 1 addition & 0 deletions ui/src/components/AdvancePropertise/advanceProperties.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface SchemaProps {
* @param rowId - The ID of the row.
* @param value - The advanced settings.
* @param checkBoxChanged - Indicates whether the checkbox has changed.
* @param rowContentstackFieldUid - Uid to get correct row from tableData
*/
updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean, rowContentstackFieldUid: string) => void;

Expand Down
8 changes: 5 additions & 3 deletions ui/src/components/AuditFilterModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ const AuditFilterModal = ({

<div className="tableFilterModalStories__list">
{filterOptions?.length > 0 ? (
filterOptions.map((item, index) => (
<div key={''} >
filterOptions.map((item) => {
const uid = item?.value
return (
<div key={uid} >
<div className="tableFilterModalStories__suggestion-item">
<Checkbox
checked={selectedLevels?.some((v) => v?.value === item?.value)}
Expand All @@ -91,7 +93,7 @@ const AuditFilterModal = ({
/>
</div>
</div>
))
)})
) : (
<div className="tableFilterModalStories__no-data">
{auditLogsConstants?.filterModal?.noFilterAvailabe}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Common/Settings/Settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

.PageLayout__head,
.PageLayout__leftSidebar {
border-top: 1;
border-top: 1px solid $color-base-gray-40;
}

.PageLayout--primary {
Expand Down
3 changes: 1 addition & 2 deletions ui/src/components/LogScreen/MigrationLogViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,8 @@ const MigrationLogViewer = ({ serverPath }: LogsType) => {
) : (
<div
style={logStyles[level || ''] || logStyles.info}
className="log-entry logs-bg"
className="log-entry"
>
<div className="log-number">{index}</div>
<div className="log-time">
{timestamp
? new Date(timestamp)?.toTimeString()?.split(' ')[0]
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/LogScreen/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
font-family: 'IBM Plex Mono', monospace;
font-size: $size-font-large;
font-weight: $font-weight-medium;
padding: 30px 20px;
padding: 5px 0;
position: relative;

&.logs-bg {
Expand Down
3 changes: 1 addition & 2 deletions ui/src/components/LogScreen/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,8 @@ const TestMigrationLogViewer = ({ serverPath, sendDataToParent, projectId }: Log
) : (
<div
style={logStyles[level || ''] || logStyles.info}
className="log-entry logs-bg"
className="log-entry"
>
<div className="log-number">{index}</div>
<div className="log-time">
{timestamp
? new Date(timestamp)?.toTimeString()?.split(' ')[0]
Expand Down