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

MMI-3130 Reverted previous changes #2362

Merged
merged 7 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion api/net/Areas/Subscriber/Controllers/ContentController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ public async Task<IActionResult> UpdateAsync([FromBody] ContentModel model)
content.Summary = model.Summary;
content.Body = model.Body;
content.Versions = model.Versions;
content.IsCBRAUnqualified = model.IsCBRAUnqualified;
foreach (var tonePool in model.TonePools)
{
// Update or Add.
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion app/editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"redux-logger": "3.0.6",
"styled-components": "6.1.11",
"stylis": "4.3.2",
"tno-core": "1.0.3"
"tno-core": "1.0.4"
},
"devDependencies": {
"@simbathesailor/use-what-changed": "2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,5 @@ export const defaultFormValues = (contentType: ContentTypeName): IContentForm =>
edition: '',
byline: '',
createdOn: publishedOn.toString(),
isCBRAUnqualified: false,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ export interface IContentForm
prep?: number;
// Print Content
showOther?: boolean;
isCBRAUnqualified: boolean;
}
6 changes: 0 additions & 6 deletions app/editor/src/features/content/form/styled/ContentForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ export const ContentForm = styled.div`
padding-right: 0.5em;
}

.checkbox-cbra {
margin-left: 2em;
margin-top: 2em;
padding-right: 0.5em;
}

.content-properties {
flex-grow: 1;
padding-top: 1em;
Expand Down
1 change: 0 additions & 1 deletion app/editor/src/features/content/form/utils/toForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,5 @@ export function toForm(model: IContentModel): IContentForm {
section: model.section ?? '',
edition: model.edition ?? '',
version: model.version,
isCBRAUnqualified: model.isCBRAUnqualified,
};
}
1 change: 0 additions & 1 deletion app/editor/src/features/content/form/utils/toModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,5 @@ export function toModel(values: IContentForm): IContentModel {
postedOn: values.postedOn ? moment(values.postedOn).toISOString() : undefined,
publishedOn: moment(values.publishedOn).toISOString(),
version: values.version,
isCBRAUnqualified: values.isCBRAUnqualified,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export const useCastContentToSearchResult = () => {
? content.actions.some((a) => a.id === featuredStoryActionId && a.value === 'true')
: false,
version: content.version,
isCBRAUnqualified: content.isCBRAUnqualified,
};

return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ export interface IContentSearchResult {
transcriptStatus?: WorkOrderStatusName;
original: IContentModel;
version?: number;
isCBRAUnqualified: boolean;
}
10 changes: 5 additions & 5 deletions app/editor/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11009,7 +11009,7 @@ __metadata:
sass-extract-loader: 1.1.0
styled-components: 6.1.11
stylis: 4.3.2
tno-core: 1.0.3
tno-core: 1.0.4
typescript: 4.9.5
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -15184,9 +15184,9 @@ __metadata:
languageName: node
linkType: hard

"tno-core@npm:1.0.3":
version: 1.0.3
resolution: "tno-core@npm:1.0.3"
"tno-core@npm:1.0.4":
version: 1.0.4
resolution: "tno-core@npm:1.0.4"
dependencies:
"@elastic/elasticsearch": ^8.13.1
"@fortawesome/free-solid-svg-icons": ^6.4.2
Expand Down Expand Up @@ -15219,7 +15219,7 @@ __metadata:
styled-components: ^6.1.11
stylis: ^4.3.2
yup: ^1.1.1
checksum: 7b94d711ef5e138640b9782fa8effd797aae1d3227c07368ac264c1baf14ccde890f3501caff75ee8a730b859ee5bf813a113ee802ad445d3d106b2b539238cb
checksum: 313b17b1ad87f27205d0f8be6ae426be8a1227b938929d00409f22e25386356875ee4df5353da479fcc8ce36a5cdff7f8936dfef28167fc9e7e30614858f9836
languageName: node
linkType: hard

Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion app/subscriber/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"sheetjs": "file:packages/xlsx-0.20.1.tgz",
"styled-components": "6.1.11",
"stylis": "4.3.2",
"tno-core": "1.0.3"
"tno-core": "1.0.4"
},
"devDependencies": {
"@testing-library/jest-dom": "6.4.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ export const castToSearchResult = (message: IContentMessageModel): IContentSearc
quotes: [],
userNotifications: [],
versions: {},
isCBRAUnqualified: false,
};
};
12 changes: 12 additions & 0 deletions app/subscriber/src/features/login/styled/SystemMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,16 @@ export const SystemMessage = styled.div`
float: right;
color: ${(props) => props.theme.css.btnBkPrimary};
}

.ql-align-left {
text-align: left;
}

.ql-align-center {
text-align: center;
}

.ql-align-right {
text-align: right;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ export const defaultContent: IContentModel = {
quotes: [],
userNotifications: [],
versions: {},
isCBRAUnqualified: false,
};
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export const generateContent = (options: IGenerateContentOptions) => {
quotes: [],
userNotifications: [],
versions: {},
isCBRAUnqualified: false,
...options.content,
};
return entity;
Expand Down
10 changes: 5 additions & 5 deletions app/subscriber/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10665,7 +10665,7 @@ __metadata:
sheetjs: "file:packages/xlsx-0.20.1.tgz"
styled-components: 6.1.11
stylis: 4.3.2
tno-core: 1.0.3
tno-core: 1.0.4
typescript: 4.9.5
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -14698,9 +14698,9 @@ __metadata:
languageName: node
linkType: hard

"tno-core@npm:1.0.3":
version: 1.0.3
resolution: "tno-core@npm:1.0.3"
"tno-core@npm:1.0.4":
version: 1.0.4
resolution: "tno-core@npm:1.0.4"
dependencies:
"@elastic/elasticsearch": ^8.13.1
"@fortawesome/free-solid-svg-icons": ^6.4.2
Expand Down Expand Up @@ -14733,7 +14733,7 @@ __metadata:
styled-components: ^6.1.11
stylis: ^4.3.2
yup: ^1.1.1
checksum: 7b94d711ef5e138640b9782fa8effd797aae1d3227c07368ac264c1baf14ccde890f3501caff75ee8a730b859ee5bf813a113ee802ad445d3d106b2b539238cb
checksum: 313b17b1ad87f27205d0f8be6ae426be8a1227b938929d00409f22e25386356875ee4df5353da479fcc8ce36a5cdff7f8936dfef28167fc9e7e30614858f9836
languageName: node
linkType: hard

Expand Down
1 change: 0 additions & 1 deletion libs/net/dal/Configuration/ContentConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public override void Configure(EntityTypeBuilder<Content> builder)
builder.HasIndex(m => new { m.ContentType, m.OtherSource, m.Uid, m.Page, m.Status, m.IsHidden }, "IX_content");
builder.HasIndex(m => new { m.Edition, m.Section, m.Byline }, "IX_print_content");
builder.HasIndex(m => m.Headline, "IX_headline");
builder.Property(m => m.IsCBRAUnqualified).IsRequired();

base.Configure(builder);
}
Expand Down
Loading
Loading