Add sidebar persistence

Author: zarybnicky

Recent.py

@@ -20,7 +20,7 @@ def main():
 
     last_projects = conn.sql(f"""
     WITH maxdate AS (
-      select (date_trunc('day', max(author_when)) - interval '3 day')::date as maxdate
+      select (date_trunc('day', max(author_when)) - interval '7 day')::date as maxdate
       from git_commits JOIN repos ON git_commits.repo_id=repos.id
       WHERE {filters.commit_filter}
     )
@@ -31,7 +31,7 @@ def main():
     GROUP BY repo
     ORDER BY count(hash) DESC LIMIT 100
     """, params=filters.commit_params).df()
-    st.markdown("### Most active in last 3 days")
+    st.markdown("### Most active in last 7 days")
     st.dataframe(last_projects, hide_index=True)
 
 if __name__ == '__main__':

utils.py

@@ -61,7 +61,6 @@ def commit_filter(self):
         """
 
 def get_sidebar_filters(conn):
-
     st.markdown("""
     <style>
     [data-testid="stSidebarNavItems"] {
@@ -70,35 +69,65 @@ def get_sidebar_filters(conn):
     </style>
     """, unsafe_allow_html=True)
 
+    time_range = conn.sql("select date_trunc('month', min(author_when) - interval '15 day')::date as min, date_trunc('month', max(author_when) + interval '15 day')::date as max from git_commits").df()
+    time_range = pd.date_range(start=time_range['min'][0], end=time_range['max'][0], freq='MS')
+
+    if 'provider' not in st.session_state:
+        st.session_state['provider'] = None
+    if 'granularity' not in st.session_state:
+        st.session_state['granularity'] = 'week'
+    if 'time_from' not in st.session_state:
+        st.session_state['time_from'] = time_range[0]
+    if 'time_to' not in st.session_state:
+        st.session_state['time_to'] = time_range[-1]
+    if 'pos_repo' not in st.session_state:
+        st.session_state['pos_repo'] = None
+    if 'neg_repo' not in st.session_state:
+        st.session_state['neg_repo'] = 'mautic|matomo|imagemagick|osm2pgsql|simplesamle-php-upstream'
+    if 'pos_author' not in st.session_state:
+        st.session_state['pos_author'] = None
+    if 'neg_author' not in st.session_state:
+        st.session_state['neg_author'] = 'lctl.gov|immerda.ch|unige.ch|bastelfreak.de|kohlvanwijngaarden.nl'
+
     with st.sidebar:
-        time_range = conn.sql("select date_trunc('month', min(author_when) - interval '15 day')::date as min, date_trunc('month', max(author_when) + interval '15 day')::date as max from git_commits").df()
-        time_range = pd.date_range(start=time_range['min'][0], end=time_range['max'][0], freq='MS')
         time_range = st.select_slider(
             "Month range",
             options=time_range,
-            value=(time_range[0], time_range[-1]),
+            value=(st.session_state['time_from'], st.session_state['time_to']),
             format_func=lambda x: str(x)[0:7]
         )
 
-        p_repo = st.text_input('Repository (regex)', '')
-        p_negrepo = st.text_input('Repository exclusion (regex)', 'mautic|matomo|imagemagick|osm2pgsql|simplesamle-php-upstream')
-        p_author = st.text_input('Author name/email (regex)', '')
-        p_negauthor = st.text_input('Author name/email exclusion (regex)', 'lctl.gov|immerda.ch|unige.ch|bastelfreak.de|kohlvanwijngaarden.nl')
+        pos_repo = st.text_input('Repository (regex)', st.session_state['pos_repo'])
+        neg_repo = st.text_input('Repository exclusion (regex)', st.session_state['neg_repo'])
+        pos_author = st.text_input('Author name/email (regex)', st.session_state['pos_author'])
+        neg_author = st.text_input('Author name/email exclusion (regex)', st.session_state['neg_author'])
+
+        g_options = ['week', 'month', 'year', 'day']
+        g_index = g_options.index(st.session_state['granularity']) if st.session_state['granularity'] in g_options else None
+        granularity = st.selectbox("Graph granularity", options=g_options, index=g_index)
 
-        granularity = st.selectbox("Graph granularity", options=['week', 'month', 'year', 'day']) or 'week'
+        p_options = list(conn.sql('select name from providers').df()['name'])
+        p_index = p_options.index(st.session_state['provider']) if st.session_state['provider'] in p_options else None
+        p_provider = st.selectbox("Forge", options=p_options, index=p_index)
 
-        providers = conn.sql('select name from providers').df()
-        p_provider = st.selectbox("Forge", options=providers['name'], index=None)
+    st.session_state['provider'] = p_provider
+    st.session_state['granularity'] = granularity
+    st.session_state['time_from'] = time_range[0]
+    st.session_state['time_to'] = time_range[1]
+    st.session_state['pos_repo'] = pos_repo
+    st.session_state['neg_repo'] = neg_repo
+    st.session_state['pos_author'] = pos_author
+    st.session_state['neg_author'] = neg_author
 
     return Filters(
         provider=p_provider,
-        pos_repo=f".*({p_repo}).*" if p_repo else None,
-        neg_repo=f".*({p_negrepo}).*" if p_negrepo else None,
-        pos_author=f".*({p_author}).*" if p_author else None,
-        neg_author=f".*({p_negauthor}).*" if p_negauthor else None,
+        pos_repo=f".*({pos_repo}).*" if pos_repo else None,
+        neg_repo=f".*({neg_repo}).*" if neg_repo else None,
+        pos_author=f".*({pos_author}).*" if pos_author else None,
+        neg_author=f".*({neg_author}).*" if neg_author else None,
         time_from=time_range[0],
         time_to=time_range[1],
-        granularity=granularity,
+        granularity=granularity or 'week',
     )