Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ final class ConfigVariableDetailViewModel: ConfigVariableDetailViewModeling {
self.contentTypeName = registeredVariable.contentTypeName
self.variableTypeName = registeredVariable.destinationTypeName
self.metadataEntries = registeredVariable.metadata.displayTextEntries
.sorted { $0.key.localizedStandardCompare($1.key) == .orderedAscending }
self.isSecret = registeredVariable.isSecret
self.editorControl = registeredVariable.isEditable ? registeredVariable.editorControl : nil

Expand Down
10 changes: 5 additions & 5 deletions Sources/DevConfiguration/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"sourceLanguage" : "en",
"strings" : {
"detailView.headerSection.key" : {
"detailView.headerSection.contentType" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Key"
"value" : "Content Type"
}
}
}
},
"detailView.headerSection.contentType" : {
"detailView.headerSection.key" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Content Type"
"value" : "Key"
}
}
}
Expand Down Expand Up @@ -366,7 +366,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Is Editable"
"value" : "Editable"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ struct ConfigVariableDetailViewModelTests: RandomValueGenerating {
// set up
var metadata = ConfigVariableMetadata()
metadata.displayName = randomAlphanumericString()
metadata.requiresRelaunch = randomBool()
metadata.isEditable = randomBool()
let destinationTypeName = randomAlphanumericString()
let isSecret = randomBool()

Expand All @@ -76,13 +78,16 @@ struct ConfigVariableDetailViewModelTests: RandomValueGenerating {
let viewModel = makeViewModel(document: document, registeredVariable: variable)

// expect all constant properties are set from the registered variable
let expectedMetadataEntries = metadata.displayTextEntries
.sorted { $0.key.localizedStandardCompare($1.key) == .orderedAscending }

#expect(viewModel.key == variable.key)
#expect(viewModel.displayName == metadata.displayName)
#expect(viewModel.contentTypeName == variable.contentTypeName)
#expect(viewModel.variableTypeName == variable.destinationTypeName)
#expect(viewModel.metadataEntries == metadata.displayTextEntries)
#expect(viewModel.metadataEntries == expectedMetadataEntries)
#expect(viewModel.isSecret == isSecret)
#expect(viewModel.editorControl == .textField)
#expect(viewModel.editorControl == (metadata.isEditable ? .textField : nil))
}


Expand Down
Loading