OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#12091 Show dialog with cancel button when requesting authorization tokens

Browse Source
This commit is contained in:
Magne Sjaastad
2025-02-03 11:42:17 +01:00
parent 08c207e556
commit 938222f878
6 changed files with 124 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp
View File

@@ -1,4 +1,4 @@
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2024 Equinor ASA
//
@@ -42,6 +42,9 @@ RimCloudDataSourceCollection::RimCloudDataSourceCollection()
{
CAF_PDM_InitObject( "Cloud Data" + RiaDefines::betaFeaturePostfix(), ":/Cloud.svg" );
CAF_PDM_InitFieldNoDefault( &m_authenticate, "Authenticate", "" );
caf::PdmUiPushButtonEditor::configureEditorLabelLeft( &m_authenticate );
CAF_PDM_InitFieldNoDefault( &m_sumoFieldName, "SumoFieldId", "Field Id" );
CAF_PDM_InitFieldNoDefault( &m_sumoCaseId, "SumoCaseId", "Case Id" );
m_sumoCaseId.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
@@ -102,6 +105,13 @@ void RimCloudDataSourceCollection::fieldChangedByUi( const caf::PdmFieldHandle*
{
if ( !m_sumoConnector ) return;
if ( changedField == &m_authenticate )
{
m_sumoConnector->requestTokenWithCancelButton();
m_authenticate = false;
}
if ( changedField == &m_sumoFieldName )
{
m_sumoCaseId = "";
@@ -132,7 +142,7 @@ void RimCloudDataSourceCollection::fieldChangedByUi( const caf::PdmFieldHandle*
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCloudDataSourceCollection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
if ( !m_sumoConnector ) return {};
if ( !m_sumoConnector || !m_sumoConnector->isGranted() ) return {};
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_sumoFieldName )
@@ -185,13 +195,26 @@ QList<caf::PdmOptionItemInfo> RimCloudDataSourceCollection::calculateValueOption
//--------------------------------------------------------------------------------------------------
void RimCloudDataSourceCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiOrdering::LayoutOptions layout = { .newRow = true, .totalColumnSpan = 3, .leftLabelColumnSpan = 1 };
uiOrdering.add( &m_sumoFieldName, layout );
uiOrdering.add( &m_sumoCaseId, layout );
uiOrdering.add( &m_sumoEnsembleNames, layout );
auto authGroup = uiOrdering.addNewGroup( "Authentication" );
authGroup->add( &m_authenticate );
uiOrdering.add( &m_addDataSources, layout );
uiOrdering.add( &m_addEnsembles, layout );
bool isGranted = m_sumoConnector && m_sumoConnector->isGranted();
QString text = "Authentication Status: ";
text += isGranted ? "<font color='#228B22'>✔ Granted</font>" : "<font color='#FFA500'>❌ Not Granted</font>";
m_authenticate.uiCapability()->setUiName( text );
if ( isGranted )
{
caf::PdmUiOrdering::LayoutOptions layout = { .newRow = true, .totalColumnSpan = 3, .leftLabelColumnSpan = 1 };
uiOrdering.add( &m_sumoFieldName, layout );
uiOrdering.add( &m_sumoCaseId, layout );
uiOrdering.add( &m_sumoEnsembleNames, layout );
uiOrdering.add( &m_addDataSources, layout );
uiOrdering.add( &m_addEnsembles, layout );
}
uiOrdering.skipRemainingFields();
}
//--------------------------------------------------------------------------------------------------
@@ -201,6 +224,14 @@ void RimCloudDataSourceCollection::defineEditorAttribute( const caf::PdmFieldHan
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_authenticate )
{
if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
{
attrib->m_buttonText = "Authenticate";
}
}
if ( field == &m_addDataSources )
{
if ( auto attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )

1
ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.h
View File

@@ -57,6 +57,7 @@ private:
void addEnsembles();
private:
caf::PdmField<bool> m_authenticate;
caf::PdmField<QString> m_sumoFieldName;
caf::PdmField<QString> m_sumoCaseId;
caf::PdmField<std::vector<QString>> m_sumoEnsembleNames;

2
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
View File

@@ -185,7 +185,7 @@ bool RimWellPathCollection::loadDataAndUpdate()
{
if ( auto osduConnector = RiaApplication::instance()->makeOsduConnector() )
{
osduConnector->requestTokenBlocking();
osduConnector->requestTokenWithCancelButton();
}
}