removing inconsistency

Author: Ramakrishnan24689

Calendar/.eslintrc.json

@@ -45,15 +45,11 @@
       ],
       "quotes": [
           "error",
-<<<<<<< HEAD
           "single",
           {
             "avoidEscape": true,
             "allowTemplateLiterals": true
           }
-=======
-          "single"
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
       ],
       "semi": [
           "error",

Calendar/Calendar/ControlManifest.Input.xml

@@ -3,10 +3,7 @@
   <control namespace="PowerCAT" constructor="Calendar" version="0.0.1" display-name-key="Calendar" description-key="Calendar_Desc" control-type="virtual">
     <property name="Theme" display-name-key="Theme" of-type="Multiple" usage="input" required="false" />
     <property name="BackgroundColor" default-value="#ffffff" display-name-key="BackgroundColor" of-type="SingleLine.Text" usage="input" />
-<<<<<<< HEAD
     <property name="Language" display-name-key="Language" of-type="SingleLine.Text" usage="input" required="false" />
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     <property name="AccessibilityLabel" display-name-key="AccessibilityLabel" of-type="SingleLine.Text" usage="input" required="false" />
     <property name="SelectedDateValue" display-name-key="SelectedDateValue" of-type="DateAndTime.DateOnly" usage="bound" required="true" />
     <property name="MinDate" display-name-key="MinDate" of-type="DateAndTime.DateOnly" usage="input" required="false" />

Calendar/Calendar/__mocks__/mock-parameters.ts

@@ -20,9 +20,6 @@ export function getMockParameters(): IInputs {
         ShowWeekNumbers: new MockTwoOptionsProperty(),
         FirstDayOfWeek: new MockEnumProperty(),
         BackgroundColor: new MockStringProperty(),
-<<<<<<< HEAD
         Language: new MockStringProperty(),
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     };
 }

Calendar/Calendar/components/Calendar.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-<<<<<<< HEAD
 import {
     ThemeProvider,
     createTheme,
@@ -8,17 +7,11 @@ import {
     ICalendarStrings,
     defaultCalendarStrings,
 } from '@fluentui/react';
-=======
-import { ThemeProvider, createTheme, IPartialTheme, defaultCalendarStrings, ICalendar } from '@fluentui/react';
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
 import { Calendar as CustomCalendar } from '../fluentui-fork/Calendar/Calendar';
 import { ICalendarProps } from './Component.types';
 import { getWeeksFirstDay } from '../components/Utilities';
 import { useAsync } from '@fluentui/react-hooks';
-<<<<<<< HEAD
 import { DateTimePickerStrings } from './DateTimePickerStrings';
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
 
 export const CanvasCalendar = React.memo((props: ICalendarProps) => {
     const {
@@ -40,13 +33,9 @@ export const CanvasCalendar = React.memo((props: ICalendarProps) => {
         tabIndex,
         isDisabled,
         backgroundColor,
-<<<<<<< HEAD
         language,
     } = props;
     const [calendarString, setCalendarSting] = React.useState<ICalendarStrings>();
-=======
-    } = props;
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     const theme = React.useMemo(() => {
         try {
             return themeJSON ? createTheme(JSON.parse(themeJSON) as IPartialTheme) : undefined;
@@ -75,7 +64,6 @@ export const CanvasCalendar = React.memo((props: ICalendarProps) => {
         //eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-<<<<<<< HEAD
     React.useEffect(() => {
         async function getCalendarStrings() {
             setCalendarSting((await DateTimePickerStrings(language)) as ICalendarStrings);
@@ -87,8 +75,6 @@ export const CanvasCalendar = React.memo((props: ICalendarProps) => {
         }
     }, [language]);
 
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     return (
         // Issue : Calendar Control does not have a Disabled prop yet - https://github.com/microsoft/fluentui/issues/19453,
         // Hence custom styling with negative tabIndex are included to support disabling
@@ -100,11 +86,7 @@ export const CanvasCalendar = React.memo((props: ICalendarProps) => {
                 onSelectDate={onSelectDate}
                 value={selectedDateValue}
                 aria-label={ariaLabel}
-<<<<<<< HEAD
                 strings={calendarString}
-=======
-                strings={defaultCalendarStrings}
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
                 tabIndex={isDisabled ? -1 : tabIndex}
                 isMonthPickerVisible={monthPickerVisible}
                 isDayPickerVisible={dayPickerVisible}

Calendar/Calendar/components/Component.types.ts

@@ -17,10 +17,7 @@ export interface ICalendarProps {
     showWeekNumbers: boolean;
     firstDayOfWeek: string;
     isDisabled: boolean;
-<<<<<<< HEAD
     language: string;
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     // eslint-disable-next-line
     onSelected: (selectedDateValue: Date) => void;
     backgroundColor?: string;

Calendar/Calendar/index.ts

@@ -65,10 +65,7 @@ export class Calendar implements ComponentFramework.ReactControl<IInputs, IOutpu
             isDisabled: context.mode.isControlDisabled,
             ariaLabel: ariaLabel,
             backgroundColor: context.parameters.BackgroundColor.raw ?? '#ffffff',
-<<<<<<< HEAD
             language: context.parameters?.Language.raw?.toLowerCase() ?? 'en-us',
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
         };
         return React.createElement(CanvasCalendar, props);
     }

Calendar/Calendar/strings/Calendar.1033.resx

@@ -118,11 +118,7 @@
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
     <data name="Calendar" xml:space="preserve">
-<<<<<<< HEAD
         <value>Fluent Calendar (%VERSION%) Preview</value>
-=======
-        <value>Fluent Calendar (%VERSION%)</value>
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     </data>
     <data name="AccessibilityLabel" xml:space="preserve">
         <value>Accessibility label</value>
@@ -170,10 +166,7 @@
     <data name="BackgroundColor" xml:space="preserve">
         <value>Background Color</value>
     </data>
-<<<<<<< HEAD
     <data name="Language" xml:space="preserve">
         <value>Language</value>
     </data>
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
 </root>

Calendar/README.md

@@ -20,15 +20,12 @@ DateValue("24/7/2022",Language())
 // or specific regional language
 DateValue("24/07/2022","en-GB")
 ```
-<<<<<<< HEAD
 -   **Language** - Language in which the calendar should render. Important : Read 'Calendar Language' section of this documentation to know the language supported currently.
 For e.g. :
 Language()
 //or
 "en-US"
 
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
 -   **Show Go to Today** - Specify Yes or No to show or hide Go to Today option.
 -   **Is a Month Picker** - Specify Yes or No to show or hide month picker.
 -   **Is a Day Picker** - Specify Yes or No to show or hide day picker.
@@ -88,7 +85,6 @@ UpdateContext({ctxResizableTextareaEvent:"SetFocus" & Text(Rand())}));
 
 The context variable `ctxResizableTextareaEvent` would then be bound to the property `Input Event` property.
 
-<<<<<<< HEAD
 ### Calendar Language
 
 Below list of languages are currently unavailable. Inorder to include new language, refer the [Readme file](/Calendar/loc/Readme.md)
@@ -107,8 +103,6 @@ Below list of languages are currently unavailable. Inorder to include new langua
  - Thai(th-TH)
  - Ukrainian(uk-UA)
 
-=======
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
 ### Example Theme
 
 The following is an example of setting the theme based on the output from the [Fluent UI Theme Designer (windows.net)](https://fabricweb.z5.web.core.windows.net/pr-deploy-site/refs/heads/master/theming-designer/).

Calendar/tsconfig.json

@@ -1,18 +1,10 @@
 {
     "extends": "./node_modules/pcf-scripts/tsconfig_base.json",
     "compilerOptions": {
-<<<<<<< HEAD
         "module": "es2020",
         "moduleResolution": "Node",
         "target": "ES6",
         "typeRoots": ["node_modules/@types"],
         "esModuleInterop": true,
-=======
-        "module": "es2015",
-        "moduleResolution": "Node",
-        "target": "ES6",
-        "typeRoots": ["node_modules/@types"],
-        "esModuleInterop": true
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     }
 }

ProgressIndicator/ProgressIndicator/ControlManifest.Input.xml

@@ -5,13 +5,7 @@
     <property name="Label" display-name-key="Label" of-type="SingleLine.Text" usage="input" required="false" />
     <property name="Description" display-name-key="Description" of-type="SingleLine.Text" usage="input" required="false" />
     <property name="AccessibilityLabel" display-name-key="AccessibilityLabel" of-type="SingleLine.Text" usage="input" required="false" />
-<<<<<<< HEAD
     <property name="PercentComplete" description-key="PercentComplete_Desc" display-name-key="PercentComplete" required="true" usage="input" of-type="Whole.None" default-value="40" />
-=======
-    <property name="PercentComplete" description-key="PercentComplete_Desc" display-name-key="PercentComplete" required="true" usage="input" of-type="Decimal" default-value="0" />
-    <!--<property name="IntervalIncrement" description-key="IntervalIncrement_desc" display-name-key="IntervalIncrement_desc" required="false" usage="input" of-type="Decimal" default-value="0.01" />
-    <property name="IntervalDelay" description-key="IntervalDelay_Desc" display-name-key="Interval Delay" required="false" usage="input" of-type="Whole.None" default-value="100" />-->
->>>>>>> 48d69ffc393a155d03b3e7517eb7dc7512b10fd5
     <property name="TypeofIndicator" display-name-key="TypeofIndicator" description-key="TypeofIndicator" usage="input" of-type="Enum" required="true">
       <value name="DefaultIndicator" display-name-key="DefaultIndicator" description-key="DefaultIndicator" default="true">Default Indicator</value>
       <value name="IndeterminateIndicator" display-name-key="IndeterminateIndicator" description-key="IndeterminateIndicator">Indeterminate Indicator</value>