Merge pull request #2443 from ORCID/lmendoza/9579-v3-work-types-lectu…

…re-and-public-speech

9579-v3-work-types-lecture-and-public-speech

src/app/cdk/platform-info/browserlist.regexp.ts

@@ -1,3 +1,2 @@
 // tslint:disable-next-line: max-line-length
-export const BROWSERLIST_REGEXP =
-  /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
+export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/

src/app/record/components/work-form/work-form/work-type-menu.ts

@@ -144,8 +144,8 @@ export const WorkTypeMenu: DeepSelectMenu[] = [
         value: WorkTypes.newspaperArticle,
       },
       {
-        label: WorkTypesLabels[WorkTypes.lectureSpeech],
-        value: WorkTypes.lectureSpeech,
+        label: WorkTypesLabels[WorkTypes.publicSpeech],
+        value: WorkTypes.publicSpeech,
       },
       { label: WorkTypesLabels[WorkTypes.website], value: WorkTypes.website },
       {
@@ -287,7 +287,10 @@ export const WorkTypeMenu: DeepSelectMenu[] = [
     value: WorkCategories.teachingAndSupervision,
     description: $localize`:@@works.teachingDescription:Working with students`,
     content: [
-      // No value for: Lecture ??
+      {
+        value: WorkTypes.lectureSpeech,
+        label: WorkTypesLabels[WorkTypes.lectureSpeech],
+      },
       {
         value: WorkTypes.learningObject,
         label: WorkTypesLabels[WorkTypes.learningObject],

src/app/types/works.endpoint.ts

@@ -77,6 +77,7 @@ export enum WorkTypes {
   musicalComposition = 'musical-composition',
   sound = 'sound',
   transcription = 'transcription',
+  publicSpeech = 'public-speech'
 }
 
 export const WorkCategoriesLabel = {
@@ -127,7 +128,7 @@ export const WorkTypesLabels = {
   [WorkTypes.dataManagementPlan]: $localize`:@@works.dataManagementPlan:Data management plan`,
   [WorkTypes.dataSet]: $localize`:@@works.plan:Dataset`,
   [WorkTypes.invention]: $localize`:@@works.invention:Invention`,
-  [WorkTypes.lectureSpeech]: $localize`:@@works.speech:Talk, interview, podcast or speech`,
+  [WorkTypes.lectureSpeech]: $localize`:@@works.speech:Lecture`,
   [WorkTypes.physicalObject]: $localize`:@@works.object:Physical object`,
   [WorkTypes.researchTechnique]: $localize`:@@works.technique:Research protocol or technique`,
   [WorkTypes.software]: $localize`:@@works.software:Software`,
@@ -148,6 +149,7 @@ export const WorkTypesLabels = {
   [WorkTypes.musicalComposition]: $localize`:@@works.musicalComposition:Musical composition`,
   [WorkTypes.sound]: $localize`:@@works.sound:Sound`,
   [WorkTypes.transcription]: $localize`:@@works.transcription:Transcription`,
+  [WorkTypes.publicSpeech]: $localize`:@@works.publicSpeech:Talk, interview, podcast or speech`,
 }
 
 export enum WorksTitleName {

src/locale/properties/works/works.en.properties

@@ -66,7 +66,7 @@ works.artisticPerformance=Artistic output or performance
 works.dataManagementPlan=Data management plan
 works.plan=Dataset
 works.invention=Invention
-works.speech=Talk, interview, podcast or speech
+works.speech=Lecture
 works.object=Physical object
 works.technique=Research protocol or technique
 works.software=Software
@@ -278,3 +278,4 @@ works.academicPublication=Academic publications
 works.reviewAndEditing=Review and editing
 works.pleaseSelectWork=Please select a work type
 works.learningObject=Teaching material
+works.publicSpeech=Talk, interview, podcast or speech