Skip to content

Fix: Skip view fetching when viewNs is not configured #316

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

Open
Mosh-K wants to merge 1 commit into
base: gh_master
Choose a base branch
from
Open

Fix: Skip view fetching when viewNs is not configured #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/XrmDefinitelyTyped/Generation/DataRetrieval.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ let retrieveCrmVersion mainProxy =
version

/// Retrieve all the necessary CRM data
let retrieveCrmData crmVersion entities solutions (mainProxy:IOrganizationService) skipInactiveForms =
let retrieveCrmData crmVersion entities solutions (mainProxy:IOrganizationService) skipInactiveForms fetchViews =
let nameMap =
retrieveEntityNameMap mainProxy

Expand All @@ -125,7 +125,7 @@ let retrieveCrmData crmVersion entities solutions (mainProxy:IOrganizationServic
|> Array.sortBy(fun md -> md.LogicalName)

let rawViewData, additionalEntityMetadata =
match crmVersion .>= (8,2,0,0) with
match fetchViews && crmVersion .>= (8,2,0,0) with
| false -> [||], [||]
| true -> retrieveViews entities originalRawEntityMetadata mainProxy

Expand Down
4 changes: 2 additions & 2 deletions src/XrmDefinitelyTyped/Generation/GenerationMain.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ open FileGeneration


/// Retrieve data from CRM and setup raw state
let retrieveRawState xrmAuth rSettings =
let retrieveRawState xrmAuth rSettings fetchViews =
let mainProxy = connectToCrm xrmAuth

let crmVersion = retrieveCrmVersion mainProxy
Expand All @@ -19,7 +19,7 @@ let retrieveRawState xrmAuth rSettings =
let skipInactiveForms = rSettings.skipInactiveForms

// Retrieve data from CRM
retrieveCrmData crmVersion entities rSettings.solutions mainProxy skipInactiveForms
retrieveCrmData crmVersion entities rSettings.solutions mainProxy skipInactiveForms fetchViews

/// Main generator function
let generateFromRaw gSettings rawState =
Expand Down
4 changes: 2 additions & 2 deletions src/XrmDefinitelyTyped/XrmDefinitelyTyped.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type XrmDefinitelyTyped private () =
try
#endif

retrieveRawState xrmAuth rSettings
retrieveRawState xrmAuth rSettings (gSettings.viewNs |> Option.isSome)
|> generateFromRaw gSettings
printfn "\nSuccessfully generated all TypeScript declaration files."

Expand All @@ -76,7 +76,7 @@ type XrmDefinitelyTyped private () =
let serializer = DataContractJsonSerializer(typeof<RawState>, null, System.Int32.MaxValue, true, null, false)
use stream = new FileStream(filePath, FileMode.Create)

retrieveRawState xrmAuth rSettings
retrieveRawState xrmAuth rSettings true
|> fun state -> serializer.WriteObject(stream, state)
printfn "\nSuccessfully saved retrieved data to file %s." (Path.GetFullPath filePath)

Expand Down