MMI-3130 Reverted previous changes (#2362)

* MMI-3130 Reverted previous changes This reverts commit 5f21aa0. * MMI-3130 Reverted previous changes - added migration scripts * Fix message alignment (#2364) * MMI-3130 Reverted previous changes This reverts commit 5f21aa0. * MMI-3130 Reverted previous changes - added migration scripts * MMI-3130 Upgraded tno-core version --------- Co-authored-by: Jeremy Foster <jeremy.foster@fosol.ca>
bcgov · Dec 16, 2024 · 94a3dc5 · 94a3dc5
1 parent 932bedc
commit 94a3dc5
Show file tree

Hide file tree

Showing 32 changed files with 7,423 additions and 98 deletions.
diff --git a/api/net/Areas/Subscriber/Controllers/ContentController.cs b/api/net/Areas/Subscriber/Controllers/ContentController.cs
@@ -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.

diff --git a/...-core-npm-1.0.3-7d7d539e80-7b94d711ef.zip → ...-core-npm-1.0.4-139085a13d-313b17b1ad.zip b/...-core-npm-1.0.3-7d7d539e80-7b94d711ef.zip → ...-core-npm-1.0.4-139085a13d-313b17b1ad.zip
diff --git a/app/editor/package.json b/app/editor/package.json
@@ -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",

diff --git a/app/editor/src/features/content/form/constants/defaultFormValues.ts b/app/editor/src/features/content/form/constants/defaultFormValues.ts
@@ -48,6 +48,5 @@ export const defaultFormValues = (contentType: ContentTypeName): IContentForm =>
     edition: '',
     byline: '',
     createdOn: publishedOn.toString(),
-    isCBRAUnqualified: false,
   };
 };
diff --git a/app/editor/src/features/content/form/interfaces/IContentForm.ts b/app/editor/src/features/content/form/interfaces/IContentForm.ts
@@ -29,5 +29,4 @@ export interface IContentForm
   prep?: number;
   // Print Content
   showOther?: boolean;
-  isCBRAUnqualified: boolean;
 }
diff --git a/app/editor/src/features/content/form/styled/ContentForm.tsx b/app/editor/src/features/content/form/styled/ContentForm.tsx
@@ -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;

diff --git a/app/editor/src/features/content/form/utils/toForm.ts b/app/editor/src/features/content/form/utils/toForm.ts
@@ -55,6 +55,5 @@ export function toForm(model: IContentModel): IContentForm {
     section: model.section ?? '',
     edition: model.edition ?? '',
     version: model.version,
-    isCBRAUnqualified: model.isCBRAUnqualified,
   };
 }
diff --git a/app/editor/src/features/content/form/utils/toModel.ts b/app/editor/src/features/content/form/utils/toModel.ts
@@ -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,
   };
 }
diff --git a/app/editor/src/store/slices/content/hooks/useCastContentToSearchResult.ts b/app/editor/src/store/slices/content/hooks/useCastContentToSearchResult.ts
@@ -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;

diff --git a/app/editor/src/store/slices/content/interfaces/IContentSearchResult.ts b/app/editor/src/store/slices/content/interfaces/IContentSearchResult.ts
@@ -26,5 +26,4 @@ export interface IContentSearchResult {
   transcriptStatus?: WorkOrderStatusName;
   original: IContentModel;
   version?: number;
-  isCBRAUnqualified: boolean;
 }
diff --git a/app/editor/yarn.lock b/app/editor/yarn.lock
@@ -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
@@ -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
@@ -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
 

diff --git a/...-core-npm-1.0.3-7d7d539e80-7b94d711ef.zip → ...-core-npm-1.0.4-139085a13d-313b17b1ad.zip b/...-core-npm-1.0.3-7d7d539e80-7b94d711ef.zip → ...-core-npm-1.0.4-139085a13d-313b17b1ad.zip
diff --git a/app/subscriber/package.json b/app/subscriber/package.json
@@ -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",

diff --git a/app/subscriber/src/features/commentary/utils/castToSearchResult.ts b/app/subscriber/src/features/commentary/utils/castToSearchResult.ts
@@ -17,6 +17,5 @@ export const castToSearchResult = (message: IContentMessageModel): IContentSearc
     quotes: [],
     userNotifications: [],
     versions: {},
-    isCBRAUnqualified: false,
   };
 };
diff --git a/app/subscriber/src/features/my-reports/constants/defaultContent.ts b/app/subscriber/src/features/my-reports/constants/defaultContent.ts
@@ -31,5 +31,4 @@ export const defaultContent: IContentModel = {
   quotes: [],
   userNotifications: [],
   versions: {},
-  isCBRAUnqualified: false,
 };
diff --git a/app/subscriber/src/features/my-reports/edit/settings/template/utils/generateContent.ts b/app/subscriber/src/features/my-reports/edit/settings/template/utils/generateContent.ts
@@ -63,7 +63,6 @@ export const generateContent = (options: IGenerateContentOptions) => {
     quotes: [],
     userNotifications: [],
     versions: {},
-    isCBRAUnqualified: false,
     ...options.content,
   };
   return entity;

diff --git a/app/subscriber/yarn.lock b/app/subscriber/yarn.lock
@@ -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
@@ -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
@@ -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
 

diff --git a/libs/net/dal/Configuration/ContentConfiguration.cs b/libs/net/dal/Configuration/ContentConfiguration.cs
@@ -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);
     }