-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Suggested Cards: Create data source for persisting card interactions to localStorage #6439
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.
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* Copyright 2023 The TensorFlow Authors. All Rights Reserved. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
==============================================================================*/ | ||
import {Injectable} from '@angular/core'; | ||
import {CardInteractions} from '../store/metrics_types'; | ||
|
||
const CARD_INTERACTIONS_KEY = 'tb-card-interactions'; | ||
|
||
const MAX_RECORDS: Record<keyof CardInteractions, number> = { | ||
pins: 10, | ||
clicks: 10, | ||
tagFilters: 10, | ||
}; | ||
|
||
@Injectable() | ||
export class CardInteractionsDataSource { | ||
saveCardInteractions(cardInteractions: CardInteractions) { | ||
const trimmedInteractions: CardInteractions = { | ||
pins: cardInteractions.pins.slice( | ||
cardInteractions.pins.length - MAX_RECORDS.pins | ||
), | ||
clicks: cardInteractions.clicks.slice( | ||
cardInteractions.clicks.length - MAX_RECORDS.clicks | ||
), | ||
tagFilters: cardInteractions.tagFilters.slice( | ||
cardInteractions.tagFilters.length - MAX_RECORDS.tagFilters | ||
), | ||
}; | ||
localStorage.setItem( | ||
CARD_INTERACTIONS_KEY, | ||
JSON.stringify(trimmedInteractions) | ||
); | ||
} | ||
|
||
getCardInteractions(): CardInteractions { | ||
const existingInteractions = localStorage.getItem(CARD_INTERACTIONS_KEY); | ||
if (existingInteractions) { | ||
return JSON.parse(existingInteractions) as CardInteractions; | ||
} | ||
return { | ||
tagFilters: [], | ||
pins: [], | ||
clicks: [], | ||
}; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/* Copyright 2023 The TensorFlow Authors. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
==============================================================================*/ | ||
import {NgModule} from '@angular/core'; | ||
import {CardInteractionsDataSource} from './card_interactions_data_source'; | ||
|
||
@NgModule({ | ||
imports: [], | ||
providers: [CardInteractionsDataSource], | ||
}) | ||
export class MetricsCardInteractionsDataSourceModule {} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
/* Copyright 2023 The TensorFlow Authors. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
==============================================================================*/ | ||
import {TestBed} from '@angular/core/testing'; | ||
import {CardInteractionsDataSource} from './card_interactions_data_source'; | ||
import {PluginType} from '../internal_types'; | ||
|
||
describe('CardInteractionsDataSource Test', () => { | ||
let mockStorage: Record<string, string>; | ||
let dataSource: CardInteractionsDataSource; | ||
|
||
beforeEach(async () => { | ||
await TestBed.configureTestingModule({ | ||
providers: [CardInteractionsDataSource], | ||
}); | ||
|
||
dataSource = TestBed.inject(CardInteractionsDataSource); | ||
|
||
mockStorage = {}; | ||
spyOn(window.localStorage, 'setItem').and.callFake( | ||
(key: string, value: string) => { | ||
if (key !== 'tb-card-interactions') { | ||
throw new Error('incorrect key used'); | ||
} | ||
|
||
mockStorage[key] = value; | ||
} | ||
); | ||
|
||
spyOn(window.localStorage, 'getItem').and.callFake((key: string) => { | ||
if (key !== 'tb-card-interactions') { | ||
throw new Error('incorrect key used'); | ||
} | ||
|
||
return mockStorage[key]; | ||
}); | ||
}); | ||
|
||
describe('saveCardInteractions', () => { | ||
it('only saves 10 pins', () => { | ||
dataSource.saveCardInteractions({ | ||
clicks: [], | ||
tagFilters: [], | ||
pins: Array.from({length: 12}).map((_, index) => ({ | ||
cardId: `card-${index}`, | ||
runId: null, | ||
tag: 'foo', | ||
plugin: PluginType.SCALARS, | ||
})), | ||
}); | ||
|
||
expect(dataSource.getCardInteractions().pins.length).toEqual(10); | ||
}); | ||
|
||
it('only saves 10 clicks', () => { | ||
dataSource.saveCardInteractions({ | ||
pins: [], | ||
tagFilters: [], | ||
clicks: Array.from({length: 12}).map((_, index) => ({ | ||
cardId: `card-${index}`, | ||
runId: null, | ||
tag: 'foo', | ||
plugin: PluginType.SCALARS, | ||
})), | ||
}); | ||
|
||
expect(dataSource.getCardInteractions().clicks.length).toEqual(10); | ||
}); | ||
|
||
it('only saves 10 tagFilgers', () => { | ||
dataSource.saveCardInteractions({ | ||
clicks: [], | ||
tagFilters: Array.from({length: 12}).map((_, index) => | ||
index.toString() | ||
), | ||
pins: [], | ||
}); | ||
|
||
expect(dataSource.getCardInteractions().tagFilters.length).toEqual(10); | ||
}); | ||
}); | ||
|
||
describe('getCardInteractions', () => { | ||
it('returns all default state when key is not set', () => { | ||
expect(dataSource.getCardInteractions()).toEqual({ | ||
tagFilters: [], | ||
pins: [], | ||
clicks: [], | ||
}); | ||
}); | ||
|
||
it('returns previously written value', () => { | ||
dataSource.saveCardInteractions({ | ||
tagFilters: ['foo'], | ||
clicks: [ | ||
{cardId: '1', runId: null, tag: 'foo', plugin: PluginType.SCALARS}, | ||
], | ||
pins: [ | ||
{cardId: '2', runId: null, tag: 'bar', plugin: PluginType.SCALARS}, | ||
], | ||
}); | ||
|
||
expect(dataSource.getCardInteractions()).toEqual({ | ||
tagFilters: ['foo'], | ||
clicks: [ | ||
{cardId: '1', runId: null, tag: 'foo', plugin: PluginType.SCALARS}, | ||
], | ||
pins: [ | ||
{cardId: '2', runId: null, tag: 'bar', plugin: PluginType.SCALARS}, | ||
], | ||
}); | ||
}); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -453,6 +453,16 @@ const {initialState, reducers: namespaceContextedReducer} = | |
settings: METRICS_SETTINGS_DEFAULT, | ||
settingOverrides: {}, | ||
visibleCardMap: new Map<ElementId, CardId>(), | ||
previousCardInteractions: { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is fine. However, I would prefer to add this state into the reducer when it is starting to be used. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would need to define the state property as optional in order to make typescript happy and I would rather not do that. It's also inconsistent with the way we define other defaults. |
||
tagFilters: [], | ||
pins: [], | ||
clicks: [], | ||
}, | ||
newCardInteractions: { | ||
tagFilters: [], | ||
pins: [], | ||
clicks: [], | ||
}, | ||
}, | ||
|
||
/** onNavigated */ | ||
|
Uh oh!
There was an error while loading. Please reload this page.