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.

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

Create new worksheet and table when table is already available #469

Merged
merged 4 commits into from
Jul 9, 2024
Merged

Create new worksheet and table when table is already available #469

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c668f83
Applied early exit
Etschbeijer Jul 9, 2024
77601e8
Applied review changes
Etschbeijer Jul 9, 2024
62b1c67
Applied review changes
Etschbeijer Jul 9, 2024
2c54f08
applied review changes
Etschbeijer Jul 9, 2024
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
106 changes: 65 additions & 41 deletions src/Client/OfficeInterop/OfficeInterop.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ let tryGetPrevTable (context:RequestContext) =
/// Get output column of arc excel table
/// </summary>
/// <param name="context"></param>
let getPrevTableOutput (context:RequestContext) =
let tryGetPrevTableOutput (context:RequestContext) =
promise {

let! inMemoryTable = tryGetPrevTable context
Expand All @@ -276,15 +276,15 @@ let getPrevTableOutput (context:RequestContext) =
|> (fun lists -> lists.Head.Head :: lists.Head.Tail)
|> Array.ofList

if outputValues.Length > 0 then return outputValues
else return [||]
if outputValues.Length > 0 then return Some outputValues
else return None

else

return [||]
return None

else
return [||]
return None
}

/// <summary>This function is used to create a new annotation table.
Expand Down Expand Up @@ -313,26 +313,19 @@ let private createAnnotationTableAtRange (isDark:bool, tryUseLastOutput:bool, ra
let tableRange = range.getColumn(0)
let _ = tableRange.load(U2.Case2 (ResizeArray(["rowIndex"; "columnIndex"; "rowCount"; "address"; "isEntireColumn"; "worksheet"])))

let activeSheet = tableRange.worksheet
let mutable activeSheet = tableRange.worksheet
let _ = activeSheet.load(U2.Case2 (ResizeArray[|"tables"|]))
let activeTables = activeSheet.tables.load(propertyNames=U2.Case1 "items")

let r = context.runtime.load(U2.Case1 "enableEvents")

promise {

// Is user input signals to try and find+reuse the output from the previous annotationTable do this, otherwise just return empty array
let! prevTableOutput =
if tryUseLastOutput then getPrevTableOutput context
else promise {return Array.empty}

// If try to use last output check if we found some output in "prevTableOutput" by checking if the array is not empty.
let useExistingPrevOutput = tryUseLastOutput && Array.isEmpty >> not <| prevTableOutput

let! allTableNames = getAllTableNames context
//Required because a new tablerange is required for the new table range
let mutable hasCreatedNewWorkSheet = false

promise {

// sync with proxy objects after loading values from excel
let! table = context.sync().``then``( fun _ ->
do! context.sync().``then``( fun _ ->

// Filter all names of tables on the active worksheet for names starting with "annotationTable".
let annoTables =
Expand All @@ -341,16 +334,47 @@ let private createAnnotationTableAtRange (isDark:bool, tryUseLastOutput:bool, ra
|> Array.map (fun x -> x.name)
|> Array.filter (fun x -> x.StartsWith "annotationTable")

// Fail the function if there are not exactly 0 annotation tables in the active worksheet.
match annoTables.Length with
//Create a new annotation table in the active worksheet
| 0 ->
()
//Create a mew worksheet with a new annotation table when the active worksheet already contains one
| x when x = 1 ->
//Create new worksheet and set it active
context.workbook.worksheets.add() |> ignore
let lastWorkSheet = context.workbook.worksheets.getLast()
lastWorkSheet.activate()
activeSheet <- lastWorkSheet
hasCreatedNewWorkSheet <- true
// Fail the function if there are more than 1 annotation table in the active worksheet.
// This check is done, to only have one annotationTable per workSheet.
let _ =
match annoTables.Length with
| x when x > 0 ->
failwith "The active worksheet contains more than zero annotationTables. Please move to a new worksheet."
| 0 ->
()
| _ ->
failwith "The active worksheet contains a negative number of annotation tables. Obviously this cannot happen. Please report this as a bug to the developers."
| x when x > 1 ->
failwith "The active worksheet contains more than one annotationTable. This should not happen. Please report this as a bug to the developers."
| _ ->
failwith "The active worksheet contains a negative number of annotation tables. Obviously this cannot happen. Please report this as a bug to the developers."
)

// Is user input signals to try and find+reuse the output from the previous annotationTable do this, otherwise just return empty array
let! prevTableOutput =
Freymaurer marked this conversation as resolved.
Show resolved Hide resolved
if (tryUseLastOutput) then tryGetPrevTableOutput context
else promise {return None}

// If try to use last output check if we found some output in "prevTableOutput" by checking if the array is not empty.
let useExistingPrevOutput = (tryUseLastOutput) && prevTableOutput.IsSome
Freymaurer marked this conversation as resolved.
Show resolved Hide resolved
log("useExistingPrevOutput", useExistingPrevOutput)
let! allTableNames = getAllTableNames context

let newTableRange =
if hasCreatedNewWorkSheet then activeSheet.getCell(tableRange.rowIndex, tableRange.columnIndex)
Freymaurer marked this conversation as resolved.
Show resolved Hide resolved
else tableRange

let _ =
Freymaurer marked this conversation as resolved.
Show resolved Hide resolved
activeSheet.load(propertyNames = U2.Case2 (ResizeArray[|"name"|])) |> ignore
if hasCreatedNewWorkSheet then newTableRange.load(U2.Case2 (ResizeArray(["rowIndex"; "columnIndex"; "rowCount"; "address"; "isEntireColumn"; "worksheet"])))
else tableRange

// sync with proxy objects after loading values from excel
let! table = context.sync().``then``( fun _ ->

// Ref. 1
r.enableEvents <- false
Expand All @@ -368,33 +392,33 @@ let private createAnnotationTableAtRange (isDark:bool, tryUseLastOutput:bool, ra

let tableStrings = inMemoryTable.ToExcelValues()

let annotationTable = activeSheet.tables.add(U2.Case1 tableRange, true)
let annotationTable = activeSheet.tables.add(U2.Case1 newTableRange, true)

// Update annotationTable name
annotationTable.name <- newName

tableRange.values <- tableStrings
newTableRange.values <- tableStrings

// Update annotationTable style
annotationTable.style <- style
annotationTable
)

let _ = table.rows.load(propertyNames = U2.Case2 (ResizeArray[|"count"|]))

//Skip header because it is newly generated for inMemory table
let newColValues =
prevTableOutput.[1..]
|> Array.map (fun cell ->
[|cell|]
|> Array.map (box >> Some)
|> ResizeArray
) |> ResizeArray

let! table, logging = context.sync().``then``(fun _ ->

//logic to compare size of previous table and current table and adapt size of inMemory table
if useExistingPrevOutput then
//Skip header because it is newly generated for inMemory table
let newColValues =
prevTableOutput.Value.[1..]
|> Array.map (fun cell ->
[|cell|]
|> Array.map (box >> Some)
|> ResizeArray
) |> ResizeArray

let rowCount0 = int table.rows.count
let diff = rowCount0 - newColValues.Count

Expand All @@ -413,9 +437,9 @@ let private createAnnotationTableAtRange (isDark:bool, tryUseLastOutput:bool, ra
activeSheet.getUsedRange().format.autofitRows()

r.enableEvents <- true

// Return info message
let logging = InteropLogging.Msg.create InteropLogging.Info (sprintf "Annotation Table created in [%s] with dimensions 2c x (%.0f + 1h)r." tableRange.address (tableRange.rowCount - 1.))
let logging = InteropLogging.Msg.create InteropLogging.Info (sprintf "Annotation Table created in [%s] with dimensions 2c x (%.0f + 1h)r." newTableRange.address (newTableRange.rowCount - 1.))

table, logging
)
Expand Down